Merge pull request #1 from PHPFastCGI/upgrade-to-2-7

Upgraded kernel wrapper to handle PSR messages

Author: AndrewCarterUK

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-    - 5.4
     - 5.5
     - 5.6
     - hhvm

Bridge/KernelWrapper.php

@@ -3,8 +3,9 @@
 namespace PHPFastCGI\SpeedfonyBundle\Bridge;
 
 use PHPFastCGI\FastCGIDaemon\KernelInterface;
-use PHPFastCGI\FastCGIDaemon\Http\RequestEnvironmentInterface;
-use Symfony\Component\HttpFoundation\Request;
+use Psr\Http\Message\ServerRequestInterface;
+use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
+use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Component\HttpKernel\Kernel;
 
 class KernelWrapper implements KernelInterface
@@ -14,48 +15,37 @@ class KernelWrapper implements KernelInterface
      */
     protected $kernel;
 
+    /**
+     * @var HttpFoundationFactoryInterface
+     */
+    protected $symfonyMessageFactory;
+
+    /**
+     * @var HttpMessageFactoryInterface
+     */
+    protected $psrMessageFactory;
+
     /**
      * Constructor.
      * 
      * @param Kernel $kernel
      */
-    public function __construct(Kernel $kernel)
+    public function __construct(Kernel $kernel, HttpFoundationFactoryInterface $symfonyMessageFactory, HttpMessageFactoryInterface $psrMessageFactory)
     {
-        $this->kernel = $kernel;
+        $this->kernel                = $kernel;
+        $this->symfonyMessageFactory = $symfonyMessageFactory;
+        $this->psrMessageFactory     = $psrMessageFactory;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function handleRequest(RequestEnvironmentInterface $requestEnvironment)
+    public function handleRequest(ServerRequestInterface $request)
     {
-        $server  = $requestEnvironment->getServer();
-        $query   = $requestEnvironment->getQuery();
-        $post    = $requestEnvironment->getPost();
-        $files   = $requestEnvironment->getFiles();
-        $cookies = $requestEnvironment->getCookies();
-        $content = null;
-
-        $body = $requestEnvironment->getBody();
-
-        if (null !== $body) {
-            $content = stream_get_contents($body);
-        }
-
-        $request = new Request($query, $post, [], $cookies, $files, $server, $content);
-
-        $response = $this->kernel->handle($request);
-
-        $statusCode = $response->getStatusCode();
-
-        if (isset($response::$statusTexts[$statusCode])) {
-            $reasonPhrase = $response::$statusTexts[$statusCode];
-        } else {
-            $reasonPhrase = '';
-        }
+        $symfonyRequest = $this->symfonyMessageFactory->createRequest($request);;
 
-        $headers = explode("\r\n", trim((string) $response->headers));
+        $symfonyResponse = $this->kernel->handle($symfonyRequest);
 
-        return new Response($statusCode, $reasonPhrase, $headers, $response->getContent());
+        return $this->psrMessageFactory->createResponse($symfonyResponse);
     }
 }

Bridge/Response.php

@@ -1,6 +1,12 @@
 services:
+    php_fast_cgi_speedfony.symfony_message_factory:
+        class: Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory
+
+    php_fast_cgi_speedfony.psr_message_factory:
+        class: Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory
+
     php_fast_cgi_speedfony.daemon_run_command:
         class: PHPFastCGI\SpeedfonyBundle\Command\DaemonRunCommand
-        arguments: [@kernel]
+        arguments: ['@kernel', '@php_fast_cgi_speedfony.symfony_message_factory', '@php_fast_cgi_speedfony.psr_message_factory']
         tags:
             - { name: console.command }

Resources/config/services.yml

@@ -2,74 +2,47 @@
 
 namespace PHPFastCGI\SpeedfonyBundle\Tests\Bridge;
 
-use PHPFastCGI\FastCGIDaemon\Http\RequestEnvironmentBuilder;
 use PHPFastCGI\SpeedfonyBundle\Bridge\KernelWrapper;
+use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
+use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Zend\Diactoros\ServerRequestFactory;
 
 class KernelWrapperTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var string[] 
-     */
-    protected $params;
-
-    /**
-     * @var string
-     */
-    protected $content;
-
     public function testKernelWrapper()
     {
-        // Build response
-        $response = new Response('Hello World', 200);
+        $globals = array(
+            'server' => array(
+                'REQUEST_URI' => '/uri'
+            ),
+            'query' => array(
+                'foo' => 'bar'
+            ),
+            'post' => array(
+                'bar' => 'foo'
+            )
+        );
 
-        // Mock kernel and get wrapper
-        $kernelMock = new MockKernel(function (Request $request) use ($response) {
-            foreach ($this->params as $name => $value) {
-                $this->assertEquals($request->server->get(strtoupper($name)), $value);
-            }
+        $psrRequest      = ServerRequestFactory::fromGlobals($globals['server'], $globals['query'], $globals['post']);
+        $symfonyResponse = new Response('Hello World');
 
-            $this->assertEquals($request->query->all(),   ['bar' => 'foo', 'world' => 'hello' ]);
-            $this->assertEquals($request->request->all(), ['foo' => 'bar', 'hello' => 'world' ]);
-            $this->assertEquals($request->cookies->all(), ['one' => 'two', 'three' => 'four', 'five' => 'six' ]);
+        $kernel = new MockKernel(function (Request $symfonyRequest) use ($globals, $symfonyResponse) {
+            $this->assertEquals($globals['server'], $symfonyRequest->server->all());
+            $this->assertEquals($globals['query'],  $symfonyRequest->query->all());
+            $this->assertEquals($globals['post'],   $symfonyRequest->request->all());
 
-            return $response;
+            $this->assertEquals($globals['server']['REQUEST_URI'], $symfonyRequest->getRequestUri());
+    
+            return $symfonyResponse;
         });
 
-        $kernelWrapper = new KernelWrapper($kernelMock);
-
-        // Build request
-        $builder = new RequestEnvironmentBuilder();
-
-        $this->params = [
-            'SERVER_PROTOCOL' => 'HTTP/1.1',
-            'REQUEST_METHOD'  => 'POST',
-            'content_type'    => 'application/x-www-form-urlencoded',
-            'REQUEST_URI'     => '/my-page',
-            'QUERY_STRING'    => 'bar=foo&world=hello',
-            'HTTP_cookie'     => 'one=two; three=four; five=six',
-        ];
-
-        $this->content = 'foo=bar&hello=world';
+        $kernelWrapper = new KernelWrapper($kernel, new HttpFoundationFactory(), new DiactorosFactory());
 
-        foreach ($this->params as $name => $value) {
-            $builder->addParam($name, $value);
-        }
-
-        $builder->addStdin($this->content);
-
-        $requestEnvironment = $builder->getRequestEnvironment();
-
-        // Hand to callback
-        $returnedResponse = $kernelWrapper->handleRequest($requestEnvironment);
-
-        $returnedOutput = (
-            'HTTP/' . $response->getProtocolVersion() . ' ' . $returnedResponse->getStatusCode() . ' ' . $returnedResponse->getReasonPhrase() . "\r\n" .
-            implode("\r\n", $returnedResponse->getHeaderLines()) . "\r\n\r\n" .
-            $returnedResponse->getBody()
-        );
+        $psrResponse = $kernelWrapper->handleRequest($psrRequest);
 
-        $this->assertEquals($returnedOutput, (string) $response);
+        $this->assertEquals($symfonyResponse->getContent(),    (string) $psrResponse->getBody());
+        $this->assertEquals($symfonyResponse->getStatusCode(), $psrResponse->getStatusCode());
     }
 }

Tests/Bridge/KernelWrapperTest.php

@@ -11,13 +11,10 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "symfony/dependency-injection": "~2.0",
-        "symfony/framework-bundle": "~2.0",
-        "symfony/http-kernel": "~2.0",
-        "symfony/console": "~2.0",
-        "symfony/config": "~2.0",
-        "phpfastcgi/fastcgi-daemon": "0.1.0"
+        "php": ">=5.5.0",
+        "symfony/symfony": "~2.7",
+        "symfony/psr-http-message-bridge": "~0.1",
+        "phpfastcgi/fastcgi-daemon": "~0.2"
     },
     "require-dev": {
         "satooshi/php-coveralls": "dev-master"