Updated to use FastCGIDaemon v0.6.*

Author: AndrewCarterUK

Bridge/KernelWrapper.php

@@ -2,51 +2,37 @@
 
 namespace PHPFastCGI\SpeedfonyBundle\Bridge;
 
+use PHPFastCGI\FastCGIDaemon\Http\RequestInterface;
 use PHPFastCGI\FastCGIDaemon\KernelInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
-use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Component\HttpKernel\Kernel;
 
 class KernelWrapper implements KernelInterface
 {
     /**
      * @var Kernel 
      */
-    protected $kernel;
-
-    /**
-     * @var HttpFoundationFactoryInterface
-     */
-    protected $symfonyMessageFactory;
-
-    /**
-     * @var HttpMessageFactoryInterface
-     */
-    protected $psrMessageFactory;
+    private $kernel;
 
     /**
      * Constructor.
      * 
      * @param Kernel $kernel
      */
-    public function __construct(Kernel $kernel, HttpFoundationFactoryInterface $symfonyMessageFactory, HttpMessageFactoryInterface $psrMessageFactory)
+    public function __construct(Kernel $kernel)
     {
-        $this->kernel                = $kernel;
-        $this->symfonyMessageFactory = $symfonyMessageFactory;
-        $this->psrMessageFactory     = $psrMessageFactory;
+        $this->kernel = $kernel;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function handleRequest(ServerRequestInterface $request)
+    public function handleRequest(RequestInterface $request)
     {
-        $symfonyRequest = $this->symfonyMessageFactory->createRequest($request);;
+        $symfonyRequest = $request->getHttpFoundationRequest();
 
         $symfonyResponse = $this->kernel->handle($symfonyRequest);
         $this->kernel->terminate($symfonyRequest, $symfonyResponse);
 
-        return $this->psrMessageFactory->createResponse($symfonyResponse);
+        return $symfonyResponse;
     }
 }

Resources/config/services.yml

@@ -1,13 +1,7 @@
 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.kernel_wrapper:
         class: PHPFastCGI\SpeedfonyBundle\Bridge\KernelWrapper
-        arguments: ['@kernel', '@php_fast_cgi_speedfony.symfony_message_factory', '@php_fast_cgi_speedfony.psr_message_factory']
+        arguments: ['@kernel']
 
     php_fast_cgi_speedfony.daemon_run_command:
         class: PHPFastCGI\FastCGIDaemon\Command\DaemonRunCommand

Tests/Bridge/KernelWrapperTest.php

@@ -2,97 +2,31 @@
 
 namespace PHPFastCGI\SpeedfonyBundle\Tests\Bridge;
 
+use PHPFastCGI\FastCGIDaemon\Http\Request;
 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 Symfony\Component\HttpKernel\Kernel;
-use Symfony\Component\Config\Loader\LoaderInterface;
-use Zend\Diactoros\ServerRequestFactory;
+use PHPFastCGI\SpeedfonyBundle\Tests\Helper\MockKernel;
+use Symfony\Component\HttpFoundation\Request as HttpFoundationRequest;
+use Symfony\Component\HttpFoundation\Response as HttpFoundationResponse;
 
 class KernelWrapperTest extends \PHPUnit_Framework_TestCase
 {
     public function testKernelWrapper()
     {
-        $globals = array(
-            'server' => array(
-                'REQUEST_URI' => '/uri'
-            ),
-            'query' => array(
-                'foo' => 'bar'
-            ),
-            'post' => array(
-                'bar' => 'foo'
-            )
-        );
+        $stream  = fopen('php://temp', 'r');
+        $request = new Request(['REQUEST_URI' => '/hello'], $stream);
 
-        $psrRequest      = ServerRequestFactory::fromGlobals($globals['server'], $globals['query'], $globals['post']);
-        $symfonyResponse = new Response('Hello World');
+        $symfonyResponse = new HttpFoundationResponse('Hello World');
 
-        $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());
-
-            $this->assertEquals($globals['server']['REQUEST_URI'], $symfonyRequest->getRequestUri());
+        $kernel = new MockKernel(function (HttpFoundationRequest $symfonyRequest) use ($symfonyResponse) {
+            $this->assertEquals('/hello', $symfonyRequest->getRequestUri());
 
             return $symfonyResponse;
         });
 
-        $kernelWrapper = new KernelWrapper($kernel, new HttpFoundationFactory(), new DiactorosFactory());
-
-        $psrResponse = $kernelWrapper->handleRequest($psrRequest);
-
-        $this->assertEquals($symfonyResponse->getContent(),    (string) $psrResponse->getBody());
-        $this->assertEquals($symfonyResponse->getStatusCode(), $psrResponse->getStatusCode());
-    }
-}
-
-class MockKernel extends Kernel
-{
-    /**
-     * @var callable
-     */
-    protected $callback;
-
-    /**
-     * Constructor.
-     * 
-     * @param callable $callback
-     */
-    public function __construct($callback)
-    {
-        $this->callback = $callback;
-
-        parent::__construct('dev', false);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function registerBundles()
-    {
-        return [];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function registerContainerConfiguration(LoaderInterface $loader)
-    {
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(Request $request, $type = 1, $catch = true)
-    {
-        return call_user_func($this->callback, $request);
+        $kernelWrapper = new KernelWrapper($kernel);
 
-        $psrResponse = $kernelWrapper->handleRequest($psrRequest);
+        $this->assertEquals($symfonyResponse, $kernelWrapper->handleRequest($request));
 
-        $this->assertEquals($symfonyResponse->getContent(),    (string) $psrResponse->getBody());
-        $this->assertEquals($symfonyResponse->getStatusCode(), $psrResponse->getStatusCode());
+        fclose($stream);
     }
 }

Tests/Helper/MockKernel.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace PHPFastCGI\SpeedfonyBundle\Tests\Helper;
+
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Kernel;
+
+class MockKernel extends Kernel
+{
+    /**
+     * @var callable
+     */
+    private $callback;
+
+    /**
+     * Constructor.
+     * 
+     * @param callable $callback
+     */
+    public function __construct($callback)
+    {
+        $this->callback = $callback;
+
+        parent::__construct('dev', false);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function registerBundles()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handle(Request $request, $type = 1, $catch = true)
+    {
+        return call_user_func($this->callback, $request);
+    }
+}

composer.json

@@ -13,8 +13,7 @@
     "require": {
         "php": ">=5.5.0",
         "symfony/symfony": "~2.7",
-        "symfony/psr-http-message-bridge": "~0.1",
-        "phpfastcgi/fastcgi-daemon": "0.5.*"
+        "phpfastcgi/fastcgi-daemon": "0.6.*"
     },
     "require-dev": {
         "satooshi/php-coveralls": "dev-master"