Updated to work with PHPFastCGI v0.6

Author: AndrewCarterUK

composer.json

@@ -12,7 +12,7 @@
     "require": {
         "php": ">=5.5.0",
         "slim/slim": "^3.0@beta",
-        "phpfastcgi/fastcgi-daemon": "0.5.*"
+        "phpfastcgi/fastcgi-daemon": "0.6.*"
     },
     "require-dev": {
         "satooshi/php-coveralls": "dev-master"

src/AppWrapper.php

@@ -2,6 +2,7 @@
 
 namespace PHPFastCGI\Slimmer;
 
+use PHPFastCGI\FastCGIDaemon\Http\RequestInterface;
 use PHPFastCGI\FastCGIDaemon\KernelInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -43,18 +44,20 @@ public function __construct(App $app)
     /**
      * {@inheritdoc}
      */
-    public function handleRequest(ServerRequestInterface $request)
+    public function handleRequest(RequestInterface $request)
     {
+        $serverRequest = $request->getServerRequest();
+
         $headers  =  new Headers(['Content-Type' => 'text/html']);
         $response = (new Response(200, $headers))->withProtocolVersion('1.1');
 
         try {
-            $response = $this->app->callMiddlewareStack($request, $response);
+            $response = $this->app->callMiddlewareStack($serverRequest, $response);
         } catch (SlimException $exception) {
             $response = $exception->getResponse();
         } catch (\Exception $exception) {
             $errorHandler = $this->container->get('errorHandler');
-            $response = $errorHandler($request, $response, $exception);
+            $response = $errorHandler($serverRequest, $response, $exception);
         }
 
         return $this->finalizeResponse($response);

test/AppWrapperTest.php

@@ -2,11 +2,11 @@
 
 namespace PHPFastCGI\Test\Slimmer;
 
+use PHPFastCGI\FastCGIDaemon\Http\Request;
 use PHPFastCGI\Slimmer\AppWrapper;
 use Slim\App;
 use Slim\Exception\Exception as SlimException;
 use Zend\Diactoros\Response\HtmlResponse;
-use Zend\Diactoros\ServerRequest;
 
 /**
  * Tests the app wrapper.
@@ -31,13 +31,16 @@ public function testHandleRequest()
         $kernel = new AppWrapper($app);
 
         // Create a request to test the route set up for the app
-        $request = new ServerRequest([], [], '/hello/Andrew');
+        $stream  = fopen('php://temp', 'r');
+        $request = new Request(['REQUEST_URI' => '/hello/Andrew'], $stream);
 
         // Get the response from the kernel that is wrapping the app
         $response = $kernel->handleRequest($request);
 
         // Check that the app has been wrapper properly by comparing to expected response
         $this->assertSame('Hello, Andrew', (string) $response->getBody());
+
+        fclose($stream);
     }
 
     /**
@@ -61,13 +64,16 @@ public function testSlimException()
         $kernel = new AppWrapper($app);
 
         // Create a request to test the route set up for the app
-        $request = new ServerRequest([], [], '/hello/Andrew');
+        $stream  = fopen('php://temp', 'r');
+        $request = new Request(['REQUEST_URI' => '/hello/Andrew'], $stream);
 
         // Get the response from the kernel that is wrapping the app
         $response = $kernel->handleRequest($request);
 
         // Check that the app has been wrapper properly by comparing to expected response
         $this->assertEquals((string) $expectedResponse->getBody(), (string) $response->getBody());
+
+        fclose($stream);
     }
 
     /**
@@ -87,13 +93,16 @@ public function testException()
         $kernel = new AppWrapper($app);
 
         // Create a request to test the route set up for the app
-        $request = new ServerRequest([], [], '/hello/Andrew');
+        $stream  = fopen('php://temp', 'r');
+        $request = new Request(['REQUEST_URI' => '/hello/Andrew'], $stream);
 
         // Get the response from the kernel that is wrapping the app
         $response = $kernel->handleRequest($request);
 
         // Check that the app has returned a valid response
         $this->assertInstanceOf('Psr\Http\Message\ResponseInterface', $response);
+
+        fclose($stream);
     }
 
     /**
@@ -118,7 +127,8 @@ public function testStrippedContentHeaders()
         $kernel = new AppWrapper($app);
 
         // Create a request to test the route set up for the app
-        $request = new ServerRequest([], [], '/hello/Andrew');
+        $stream  = fopen('php://temp', 'r');
+        $request = new Request(['REQUEST_URI' => '/hello/Andrew'], $stream);
 
         // Get the response from the kernel that is wrapping the app
         $response = $kernel->handleRequest($request);
@@ -127,5 +137,7 @@ public function testStrippedContentHeaders()
         $this->assertEquals('Hello', (string) $response->getBody());
         $this->assertFalse($response->hasHeader('Content-Type'));
         $this->assertFalse($response->hasHeader('Content-Length'));
+
+        fclose($stream);
     }
 }