Undeprecate DiactorosFactory for 1.1

nicolas-grekas · nicolas-grekas · commit 921f8669c36e · 2019-03-11T16:23:15.000+01:00
diff --git a/Factory/DiactorosFactory.php b/Factory/DiactorosFactory.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Bridge\PsrHttpMessage\Factory;
 
-@trigger_error(sprintf('The "%s" class is deprecated since symfony/psr-http-message-bridge 1.2, use PsrHttpFactory instead.', DiactorosFactory::class), E_USER_DEPRECATED);
-
 use Psr\Http\Message\UploadedFileInterface;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -30,8 +28,6 @@
  * 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,8 +16,6 @@
 /**
  * @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/composer.json b/composer.json
@@ -35,7 +35,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.2-dev"
+            "dev-master": "1.1-dev"
         }
     }
 }
