Use ServerRequestInterface as name for factory producing server request instance

Matches response factory and stream factory.

Author: weierophinney

src/ConfigProvider.php

@@ -10,6 +10,7 @@
 namespace Zend\Expressive;
 
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Zend\HttpHandlerRunner\Emitter\EmitterInterface;
 use Zend\HttpHandlerRunner\RequestHandlerRunner;
@@ -53,7 +54,7 @@ public function getDependencies() : array
                 RequestHandlerRunner::class              => Container\RequestHandlerRunnerFactory::class,
                 ResponseInterface::class                 => Container\ResponseFactoryFactory::class,
                 SERVER_REQUEST_ERROR_RESPONSE_GENERATOR  => Container\ServerRequestErrorResponseGeneratorFactory::class,
-                SERVER_REQUEST_FACTORY                   => Container\ServerRequestFactoryFactory::class,
+                ServerRequestInterface::class            => Container\ServerRequestFactoryFactory::class,
                 StreamInterface::class                   => Container\StreamFactoryFactory::class,
             ],
         ];

src/Container/RequestHandlerRunnerFactory.php

@@ -10,9 +10,9 @@
 namespace Zend\Expressive\Container;
 
 use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use Zend\Expressive\ApplicationPipeline;
 use Zend\Expressive\ServerRequestErrorResponseGenerator;
-use Zend\Expressive\ServerRequestFactory;
 use Zend\HttpHandlerRunner\Emitter\EmitterInterface;
 use Zend\HttpHandlerRunner\RequestHandlerRunner;
 
@@ -25,7 +25,7 @@
  * - Zend\Expressive\ApplicationPipeline, which should resolve to a
  *   Zend\Stratigility\MiddlewarePipeInterface and/or
  *   Psr\Http\Server\RequestHandlerInterface instance.
- * - Zend\Expressive\ServerRequestFactory, which should resolve to a PHP
+ * - Psr\Http\Message\ServerRequestInterface, which should resolve to a PHP
  *   callable that will return a Psr\Http\Message\ServerRequestInterface
  *   instance.
  * - Zend\Expressive\ServerRequestErrorResponseGenerator, which should resolve
@@ -41,7 +41,7 @@ public function __invoke(ContainerInterface $container) : RequestHandlerRunner
         return new RequestHandlerRunner(
             $container->get(ApplicationPipeline::class),
             $container->get(EmitterInterface::class),
-            $container->get(ServerRequestFactory::class),
+            $container->get(ServerRequestInterface::class),
             $container->get(ServerRequestErrorResponseGenerator::class)
         );
     }

src/constants.php

@@ -9,6 +9,8 @@
 
 namespace Zend\Expressive;
 
+use Psr\Http\Message\ServerRequestInterface;
+
 /**
  * Legacy service name for the default delegate referenced in version 2.
  * Should resolve to the Handler\NotFoundHandler class.
@@ -77,9 +79,11 @@
 const SERVER_REQUEST_ERROR_RESPONSE_GENERATOR = __NAMESPACE__ . '\ServerRequestErrorResponseGenerator';
 
 /**
- * Virtual service name that should resolve to a service capable of producing
- * a PSR-7 ServerRequestInterface instance for the application.
+ * Legacy/transitional service name for the ServerRequestFactory virtual
+ * service introduced in 3.0.0alpha6. Should resolve to the
+ * Psr\Http\Message\ServerRequestInterface service.
  *
+ * @deprecated To remove in version 4.0.0.
  * @var string
  */
-const SERVER_REQUEST_FACTORY = __NAMESPACE__ . '\ServerRequestFactory';
+const SERVER_REQUEST_FACTORY = ServerRequestInterface::class;

test/Container/RequestHandlerRunnerFactoryTest.php

@@ -11,11 +11,11 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Expressive\ApplicationPipeline;
 use Zend\Expressive\Container\RequestHandlerRunnerFactory;
 use Zend\Expressive\ServerRequestErrorResponseGenerator;
-use Zend\Expressive\ServerRequestFactory;
 use Zend\HttpHandlerRunner\Emitter\EmitterInterface;
 use Zend\HttpHandlerRunner\RequestHandlerRunner;
 
@@ -58,7 +58,7 @@ public function registerServerRequestFactoryInContainer($container) : callable
     {
         $factory = function () {
         };
-        $container->get(ServerRequestFactory::class)->willReturn($factory);
+        $container->get(ServerRequestInterface::class)->willReturn($factory);
         return $factory;
     }