Merge pull request #42 from nicolas-grekas/psr17rulez

dbu · web-flow · commit 9c00934e0389 · 2023-04-14T16:09:37.000+02:00
Deprecate all interfaces in favor of PSR-17 and allow `psr/http-message` v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log
 
 
+## 1.1.0 - Unreleased
+
+### Changed
+
+- Allow `psr/http-message` v2 in addition to v1
+- Deprecate all interfaces in favor of [PSR-17](https://www.php-fig.org/psr/psr-17/)
+
 ## 1.0.2 - 2015-12-19
 
 ### Added
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": ">=5.4",
-        "psr/http-message": "^1.0"
+        "psr/http-message": "^1.0 || ^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -21,7 +21,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.x-dev"
         }
     }
 }
diff --git a/src/MessageFactory.php b/src/MessageFactory.php
@@ -6,6 +6,8 @@
  * Factory for PSR-7 Request and Response.
  *
  * @author Márk Sági-Kazár <mark.sagikazar@gmail.com>
+ *
+ * @deprecated since version 1.1, use Psr\Http\Message\RequestFactoryInterface and Psr\Http\Message\ResponseFactoryInterface instead.
  */
 interface MessageFactory extends RequestFactory, ResponseFactory
 {
diff --git a/src/RequestFactory.php b/src/RequestFactory.php
@@ -10,6 +10,8 @@
  * Factory for PSR-7 Request.
  *
  * @author Márk Sági-Kazár <mark.sagikazar@gmail.com>
+ *
+ * @deprecated since version 1.1, use Psr\Http\Message\RequestFactoryInterface instead.
  */
 interface RequestFactory
 {
diff --git a/src/ResponseFactory.php b/src/ResponseFactory.php
@@ -11,6 +11,8 @@
  * This factory contract can be reused in Message and Server Message factories.
  *
  * @author Márk Sági-Kazár <mark.sagikazar@gmail.com>
+ *
+ * @deprecated since version 1.1, use Psr\Http\Message\ResponseFactoryInterface instead.
  */
 interface ResponseFactory
 {
diff --git a/src/StreamFactory.php b/src/StreamFactory.php
@@ -8,6 +8,8 @@
  * Factory for PSR-7 Stream.
  *
  * @author Márk Sági-Kazár <mark.sagikazar@gmail.com>
+ *
+ * @deprecated since version 1.1, use Psr\Http\Message\StreamFactoryInterface instead.
  */
 interface StreamFactory
 {
diff --git a/src/UriFactory.php b/src/UriFactory.php
@@ -8,6 +8,8 @@
  * Factory for PSR-7 URI.
  *
  * @author Márk Sági-Kazár <mark.sagikazar@gmail.com>
+ *
+ * @deprecated since version 1.1, use Psr\Http\Message\UriFactoryInterface instead.
  */
 interface UriFactory
 {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`],`
`13`	`13`	`"require": {`
`14`	`14`	`"php": ">=5.4",`
`15`		`- "psr/http-message": "^1.0"`
	`15`	`+ "psr/http-message": "^1.0 \|\| ^2.0"`
`16`	`16`	`},`
`17`	`17`	`"autoload": {`
`18`	`18`	`"psr-4": {`
`@@ -21,7 +21,7 @@`
`21`	`21`	`},`
`22`	`22`	`"extra": {`
`23`	`23`	`"branch-alias": {`
`24`		`- "dev-master": "1.0-dev"`
	`24`	`+ "dev-master": "1.x-dev"`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`	`* Factory for PSR-7 Request and Response.`
`7`	`7`	`*`
`8`	`8`	`* @author Márk Sági-Kazár <mark.sagikazar@gmail.com>`
	`9`	`+ *`
	`10`	`+ * @deprecated since version 1.1, use Psr\Http\Message\RequestFactoryInterface and Psr\Http\Message\ResponseFactoryInterface instead.`
`9`	`11`	`*/`
`10`	`12`	`interface MessageFactory extends RequestFactory, ResponseFactory`
`11`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`	`* Factory for PSR-7 Request.`
`11`	`11`	`*`
`12`	`12`	`* @author Márk Sági-Kazár <mark.sagikazar@gmail.com>`
	`13`	`+ *`
	`14`	`+ * @deprecated since version 1.1, use Psr\Http\Message\RequestFactoryInterface instead.`
`13`	`15`	`*/`
`14`	`16`	`interface RequestFactory`
`15`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`* This factory contract can be reused in Message and Server Message factories.`
`12`	`12`	`*`
`13`	`13`	`* @author Márk Sági-Kazár <mark.sagikazar@gmail.com>`
	`14`	`+ *`
	`15`	`+ * @deprecated since version 1.1, use Psr\Http\Message\ResponseFactoryInterface instead.`
`14`	`16`	`*/`
`15`	`17`	`interface ResponseFactory`
`16`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`	`* Factory for PSR-7 Stream.`
`9`	`9`	`*`
`10`	`10`	`* @author Márk Sági-Kazár <mark.sagikazar@gmail.com>`
	`11`	`+ *`
	`12`	`+ * @deprecated since version 1.1, use Psr\Http\Message\StreamFactoryInterface instead.`
`11`	`13`	`*/`
`12`	`14`	`interface StreamFactory`
`13`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`	`* Factory for PSR-7 URI.`
`9`	`9`	`*`
`10`	`10`	`* @author Márk Sági-Kazár <mark.sagikazar@gmail.com>`
	`11`	`+ *`
	`12`	`+ * @deprecated since version 1.1, use Psr\Http\Message\UriFactoryInterface instead.`
`11`	`13`	`*/`
`12`	`14`	`interface UriFactory`
`13`	`15`	`{`