Skip to content

Commit 660965b

Browse files
derrabusderrabus
committed
[PsrHttpMessageBridge] Import the bridge into the monorepo
1 parent 323cbb6 commit 660965b

File tree

9 files changed

+102
-161
lines changed

9 files changed

+102
-161
lines changed

‎.gitattributes

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
/Tests export-ignore
22
/phpunit.xml.dist export-ignore
33
/.gitattributes export-ignore
4-
/.github export-ignore
54
/.gitignore export-ignore
6-
/.php_cs.dist export-ignore

‎.github/workflows/ci.yml

-49
This file was deleted.

‎.gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
vendor/
22
composer.lock
33
phpunit.xml
4-
.php-cs-fixer.cache
5-
.php-cs-fixer.php
6-
.phpunit.result.cache
74
/Tests/Fixtures/App/var

‎.php-cs-fixer.dist.php

-25
This file was deleted.

‎CHANGELOG.md

+71-49
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,107 @@
11
CHANGELOG
22
=========
33

4-
# 2.3.1 (2023-07-26)
4+
6.4
5+
---
56

6-
* Don't rely on `Request::getPayload()` to populate the parsed body
7+
* Import the bridge into the Symfony monorepo and synchronize releases
78

8-
# 2.3.0 (2023-07-25)
9+
2.3.1
10+
-----
911

10-
* Leverage `Request::getPayload()` to populate the parsed body of PSR-7 requests
11-
* Implement `ValueResolverInterface` introduced with Symfony 6.2
12+
* Don't rely on `Request::getPayload()` to populate the parsed body
1213

13-
# 2.2.0 (2023-04-21)
14+
2.3.0
15+
-----
1416

15-
* Drop support for Symfony 4
16-
* Bump minimum version of PHP to 7.2
17-
* Support version 2 of the psr/http-message contracts
17+
* Leverage `Request::getPayload()` to populate the parsed body of PSR-7 requests
18+
* Implement `ValueResolverInterface` introduced with Symfony 6.2
1819

19-
# 2.1.3 (2022-09-05)
20+
2.2.0
21+
-----
2022

21-
* Ignore invalid HTTP headers when creating PSR7 objects
22-
* Fix for wrong type passed to `moveTo()`
23+
* Drop support for Symfony 4
24+
* Bump minimum version of PHP to 7.2
25+
* Support version 2 of the psr/http-message contracts
2326

24-
# 2.1.2 (2021-11-05)
27+
2.1.3
28+
-----
2529

26-
* Allow Symfony 6
30+
* Ignore invalid HTTP headers when creating PSR7 objects
31+
* Fix for wrong type passed to `moveTo()`
2732

28-
# 2.1.0 (2021-02-17)
33+
2.1.2
34+
-----
2935

30-
* Added a `PsrResponseListener` to automatically convert PSR-7 responses returned by controllers
31-
* Added a `PsrServerRequestResolver` that allows injecting PSR-7 request objects into controllers
36+
* Allow Symfony 6
3237

33-
# 2.0.2 (2020-09-29)
38+
2.1.0
39+
-----
3440

35-
* Fix populating server params from URI in HttpFoundationFactory
36-
* Create cookies as raw in HttpFoundationFactory
37-
* Fix BinaryFileResponse with Content-Range PsrHttpFactory
41+
* Added a `PsrResponseListener` to automatically convert PSR-7 responses returned by controllers
42+
* Added a `PsrServerRequestResolver` that allows injecting PSR-7 request objects into controllers
3843

39-
# 2.0.1 (2020-06-25)
44+
2.0.2
45+
-----
4046

41-
* Don't normalize query string in PsrHttpFactory
42-
* Fix conversion for HTTPS requests
43-
* Fix populating default port and headers in HttpFoundationFactory
47+
* Fix populating server params from URI in HttpFoundationFactory
48+
* Create cookies as raw in HttpFoundationFactory
49+
* Fix BinaryFileResponse with Content-Range PsrHttpFactory
4450

45-
# 2.0.0 (2020-01-02)
51+
2.0.1
52+
-----
4653

47-
* Remove DiactorosFactory
54+
* Don't normalize query string in PsrHttpFactory
55+
* Fix conversion for HTTPS requests
56+
* Fix populating default port and headers in HttpFoundationFactory
4857

49-
# 1.3.0 (2019-11-25)
58+
2.0.0
59+
-----
5060

51-
* Added support for streamed requests
52-
* Added support for Symfony 5.0+
53-
* Fixed bridging UploadedFile objects
54-
* Bumped minimum version of Symfony to 4.4
61+
* Remove DiactorosFactory
5562

56-
# 1.2.0 (2019-03-11)
63+
1.3.0
64+
-----
5765

58-
* Added new documentation links
59-
* Bumped minimum version of PHP to 7.1
60-
* Added support for streamed responses
66+
* Added support for streamed requests
67+
* Added support for Symfony 5.0+
68+
* Fixed bridging UploadedFile objects
69+
* Bumped minimum version of Symfony to 4.4
6170

62-
# 1.1.2 (2019-04-03)
71+
1.2.0
72+
-----
6373

64-
* Fixed createResponse
74+
* Added new documentation links
75+
* Bumped minimum version of PHP to 7.1
76+
* Added support for streamed responses
6577

66-
# 1.1.1 (2019-03-11)
78+
1.1.2
79+
-----
6780

68-
* Deprecated DiactorosFactory, use PsrHttpFactory instead
69-
* Removed triggering of deprecation
81+
* Fixed createResponse
7082

71-
# 1.1.0 (2018-08-30)
83+
1.1.1
84+
-----
7285

73-
* Added support for creating PSR-7 messages using PSR-17 factories
86+
* Deprecated DiactorosFactory, use PsrHttpFactory instead
87+
* Removed triggering of deprecation
7488

75-
# 1.0.2 (2017-12-19)
89+
1.1.0
90+
-----
7691

77-
* Fixed request target in PSR7 Request (mtibben)
92+
* Added support for creating PSR-7 messages using PSR-17 factories
7893

79-
# 1.0.1 (2017-12-04)
94+
1.0.2
95+
-----
8096

81-
* Added support for Symfony 4 (dunglas)
97+
* Fixed request target in PSR7 Request (mtibben)
8298

83-
# 1.0.0 (2016-09-14)
99+
1.0.1
100+
-----
84101

85-
* Initial release
102+
* Added support for Symfony 4 (dunglas)
103+
104+
1.0.0
105+
-----
106+
107+
* Initial release

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2021 Fabien Potencier
1+
Copyright (c) 2004-present Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎Tests/Fixtures/App/Kernel.php

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ protected function configureContainer(ContainerConfigurator $container): void
5050
'router' => ['utf8' => true],
5151
'secret' => 'for your eyes only',
5252
'test' => true,
53+
'annotations' => false,
5354
'http_method_override' => false,
5455
]);
5556

‎composer.json

+11-16
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,19 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=7.2.5",
20-
"psr/http-message": "^1.0 || ^2.0",
21-
"symfony/deprecation-contracts": "^2.5 || ^3.0",
22-
"symfony/http-foundation": "^5.4 || ^6.0"
19+
"php": ">=8.1",
20+
"psr/http-message": "^1.0|^2.0",
21+
"symfony/deprecation-contracts": "^2.5|^3.0",
22+
"symfony/http-foundation": "^5.4|^6.0"
2323
},
2424
"require-dev": {
25-
"symfony/browser-kit": "^5.4 || ^6.0",
26-
"symfony/config": "^5.4 || ^6.0",
27-
"symfony/event-dispatcher": "^5.4 || ^6.0",
28-
"symfony/framework-bundle": "^5.4 || ^6.0",
29-
"symfony/http-kernel": "^5.4 || ^6.0",
30-
"symfony/phpunit-bridge": "^6.2",
25+
"symfony/browser-kit": "^5.4|^6.0",
26+
"symfony/config": "^5.4|^6.0",
27+
"symfony/event-dispatcher": "^5.4|^6.0",
28+
"symfony/framework-bundle": "^5.4|^6.0",
29+
"symfony/http-kernel": "^5.4|^6.0",
3130
"nyholm/psr7": "^1.1",
32-
"psr/log": "^1.1 || ^2 || ^3"
31+
"psr/log": "^1.1|^2|^3"
3332
},
3433
"suggest": {
3534
"nyholm/psr7": "For a super lightweight PSR-7/17 implementation"
@@ -40,9 +39,5 @@
4039
"/Tests/"
4140
]
4241
},
43-
"extra": {
44-
"branch-alias": {
45-
"dev-main": "2.3-dev"
46-
}
47-
}
42+
"minimum-stability": "dev"
4843
}

‎phpunit.xml.dist

+18-16
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<phpunit backupGlobals="false"
4-
backupStaticAttributes="false"
3+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.3/phpunit.xsd"
5+
backupGlobals="false"
56
colors="true"
6-
convertErrorsToExceptions="true"
7-
convertNoticesToExceptions="true"
8-
convertWarningsToExceptions="true"
9-
processIsolation="false"
10-
stopOnFailure="false"
117
bootstrap="vendor/autoload.php"
8+
failOnRisky="true"
9+
failOnWarning="true"
1210
>
11+
<php>
12+
<ini name="error_reporting" value="-1" />
13+
</php>
14+
1315
<testsuites>
1416
<testsuite name="Symfony PSR-7 HTTP message Bridge Test Suite">
1517
<directory>./Tests/</directory>
1618
</testsuite>
1719
</testsuites>
1820

19-
<filter>
20-
<whitelist>
21+
<coverage>
22+
<include>
2123
<directory>./</directory>
22-
<exclude>
23-
<directory>./Resources</directory>
24-
<directory>./Tests</directory>
25-
<directory>./vendor</directory>
26-
</exclude>
27-
</whitelist>
28-
</filter>
24+
</include>
25+
<exclude>
26+
<directory>./Resources</directory>
27+
<directory>./Tests</directory>
28+
<directory>./vendor</directory>
29+
</exclude>
30+
</coverage>
2931
</phpunit>

0 commit comments

Comments
 (0)