Deprecate DiactorosFactory, use nyholm/psr7 for tests

nicolas-grekas · nicolas-grekas · commit 36a806532bb8 · 2019-03-11T15:33:59.000+01:00
diff --git a/Factory/DiactorosFactory.php b/Factory/DiactorosFactory.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bridge\PsrHttpMessage\Factory;
 
+@trigger_error(sprintf('The "%s" class is deprecated since symfony/psr-http-message-bridge 1.2, use PsrHttpFactory instea.', DiactorosFactory::class), E_USER_DEPRECATED);
+
 use Psr\Http\Message\UploadedFileInterface;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -28,6 +30,8 @@
  * Builds Psr\HttpMessage instances using the Zend Diactoros implementation.
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @deprecated since symfony/psr-http-message-bridge 1.2, use PsrHttpFactory instead
  */
 class DiactorosFactory implements HttpMessageFactoryInterface
 {
diff --git a/Tests/Factory/DiactorosFactoryTest.php b/Tests/Factory/DiactorosFactoryTest.php
@@ -16,6 +16,8 @@
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  * @author Antonio J. García Lagar <aj@garcialagar.es>
+ *
+ * @group legacy
  */
 class DiactorosFactoryTest extends AbstractHttpMessageFactoryTest
 {
diff --git a/Tests/Factory/PsrHttpFactoryTest.php b/Tests/Factory/PsrHttpFactoryTest.php
@@ -11,10 +11,7 @@
 
 namespace Symfony\Bridge\PsrHttpMessage\Tests\Factory;
 
-use Http\Factory\Diactoros\ResponseFactory;
-use Http\Factory\Diactoros\ServerRequestFactory;
-use Http\Factory\Diactoros\StreamFactory;
-use Http\Factory\Diactoros\UploadedFileFactory;
+use Nyholm\Psr7\Factory\Psr17Factory;
 use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
 
 /**
@@ -25,15 +22,8 @@ class PsrHttpFactoryTest extends AbstractHttpMessageFactoryTest
 {
     protected function buildHttpMessageFactory()
     {
-        if (!class_exists('Http\Factory\Diactoros\ServerRequestFactory')) {
-            $this->markTestSkipped('HTTP Factory for Diactoros is not installed.');
-        }
+        $factory = new Psr17Factory();
 
-        return new PsrHttpFactory(
-            new ServerRequestFactory(),
-            new StreamFactory(),
-            new UploadedFileFactory(),
-            new ResponseFactory()
-        );
+        return new PsrHttpFactory($factory, $factory, $factory, $factory);
     }
 }
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "symfony/psr-http-message-bridge",
     "type": "symfony-bridge",
     "description": "PSR HTTP message bridge",
-    "keywords": ["http", "psr-7", "http-message"],
+    "keywords": ["http", "psr-7", "psr-17", "http-message"],
     "homepage": "http://symfony.com",
     "license": "MIT",
     "authors": [
@@ -21,12 +21,11 @@
         "symfony/http-foundation": "^2.3.42 || ^3.4 || ^4.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^3.4 || 4.0"
+        "symfony/phpunit-bridge": "^3.4 || ^4.0",
+        "nyholm/psr7": "^1.1"
     },
     "suggest": {
-        "psr/http-message-implementation": "To use the HttpFoundation factory",
-        "zendframework/zend-diactoros": "To use the Zend Diactoros factory",
-        "psr/http-factory-implementation": "To use the PSR-17 factory"
+        "nyholm/psr7": "For a super lightweight PSR-7/17 implementation"
     },
     "autoload": {
         "psr-4": { "Symfony\\Bridge\\PsrHttpMessage\\": "" }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`	`/**`
`17`	`17`	`* @author Kévin Dunglas <dunglas@gmail.com>`
`18`	`18`	`* @author Antonio J. García Lagar <aj@garcialagar.es>`
	`19`	`+ *`
	`20`	`+ * @group legacy`
`19`	`21`	`*/`
`20`	`22`	`class DiactorosFactoryTest extends AbstractHttpMessageFactoryTest`
`21`	`23`	`{`