Update the tests for Slim 4

Author: mnapoli

tests/ApplicationTest.php

@@ -2,10 +2,9 @@
 
 namespace DI\Bridge\Slim\Test;
 
-use DI\Bridge\Slim\App;
+use DI\Bridge\Slim\Bridge;
 use DI\Bridge\Slim\Test\Mock\RequestFactory;
 use PHPUnit\Framework\TestCase;
-use Slim\Http\Response;
 
 class ApplicationTest extends TestCase
 {
@@ -14,14 +13,15 @@ class ApplicationTest extends TestCase
      */
     public function runs()
     {
-        $app = new App;
+        $app = Bridge::create();
 
         $called = false;
-        $app->get('/', function () use (&$called) {
+        $app->get('/', function ($request, $response) use (&$called) {
             $called = true;
+            return $response;
         });
+        $app->handle(RequestFactory::create());
 
-        $app->callMiddlewareStack(RequestFactory::create(), new Response);
         $this->assertTrue($called);
     }
 }

tests/ContainerTest.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace DI\Bridge\Slim\Test\Fixture;
 

tests/ErrorTest.php

@@ -1,13 +1,13 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace DI\Bridge\Slim\Test;
 
-use DI\Bridge\Slim\App;
+use DI\Bridge\Slim\Bridge;
 use DI\Bridge\Slim\Test\Mock\RequestFactory;
 use PHPUnit\Framework\TestCase;
-use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Slim\Http\Response;
+use Psr\Http\Server\RequestHandlerInterface;
+use Zend\Diactoros\Response\TextResponse;
 
 class MiddlewareTest extends TestCase
 {
@@ -16,14 +16,13 @@ class MiddlewareTest extends TestCase
      */
     public function invokes_closure_middleware()
     {
-        $app = new App;
-        $app->add(function (ServerRequestInterface $request, ResponseInterface $response, callable $next) {
-            $response->getBody()->write('Hello ' . $request->getQueryParams()['foo']);
-            return $response;
+        $app = Bridge::create();
+        $app->add(function (ServerRequestInterface $request, RequestHandlerInterface $next) {
+            return new TextResponse('Hello ' . $request->getQueryParams()['foo']);
         });
         $app->get('/', function () {});
 
-        $response = $app->callMiddlewareStack(RequestFactory::create('/', 'foo=matt'), new Response);
+        $response = $app->handle(RequestFactory::create('/', 'foo=matt'));
 
         $this->assertEquals('Hello matt', $response->getBody()->__toString());
     }

tests/Fixture/Middleware.php

@@ -1,18 +1,24 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace DI\Bridge\Slim\Test\Mock;
 
-use Slim\Http\Environment;
-use Slim\Http\Request;
+use Psr\Http\Message\ServerRequestInterface;
+use Zend\Diactoros\ServerRequest;
 
 class RequestFactory
 {
-    public static function create($uri = '/', $queryString = '')
+    public static function create($uri = '/', $queryString = ''): ServerRequestInterface
     {
-        return Request::createFromEnvironment(Environment::mock([
-            'SCRIPT_NAME'  => 'index.php',
-            'REQUEST_URI'  => $uri,
-            'QUERY_STRING' => $queryString,
-        ]));
+        parse_str($queryString, $queryParams);
+        return new ServerRequest(
+            [],
+            [],
+            $uri,
+            'GET',
+            'php://temp',
+            [],
+            [],
+            $queryParams
+        );
     }
 }