Merge branch 'twig-templates'

2 files changed, 17 insertions, 2 deletions

diff --git a/tests/Unit/Http/RequestServiceProviderTest.php b/tests/Unit/Http/RequestServiceProviderTest.php
index eddf7ee5..4e9bb4e0 100644
--- a/tests/Unit/Http/RequestServiceProviderTest.php
+++ b/tests/Unit/Http/RequestServiceProviderTest.php
@@ -8,6 +8,7 @@ use Engelsystem\Http\Request;
 use Engelsystem\Http\RequestServiceProvider;
 use Engelsystem\Test\Unit\ServiceProviderTest;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 
 class RequestServiceProviderTest extends ServiceProviderTest
 {
@@ -45,9 +46,16 @@ class RequestServiceProviderTest extends ServiceProviderTest
 
         $this->setExpects($app, 'call', [[Request::class, 'createFromGlobals']], $request);
         $this->setExpects($app, 'get', ['config'], $config);
-        $this->setExpects($app, 'instance', ['request', $request]);
         $this->setExpects($config, 'get', ['trusted_proxies'], $configuredProxies);
 
+        $app->expects($this->exactly(3))
+            ->method('instance')
+            ->withConsecutive(
+                [Request::class, $request],
+                [SymfonyRequest::class, $request],
+                ['request', $request]
+            );
+
         /** @var ServiceProvider|MockObject $serviceProvider */
         $serviceProvider = $this->getMockBuilder(RequestServiceProvider::class)
             ->setConstructorArgs([$app])
diff --git a/tests/Unit/Http/ResponseServiceProviderTest.php b/tests/Unit/Http/ResponseServiceProviderTest.php
index 52e95714..6ce1f4fe 100644
--- a/tests/Unit/Http/ResponseServiceProviderTest.php
+++ b/tests/Unit/Http/ResponseServiceProviderTest.php
@@ -6,6 +6,7 @@ use Engelsystem\Http\Response;
 use Engelsystem\Http\ResponseServiceProvider;
 use Engelsystem\Test\Unit\ServiceProviderTest;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 
 class ResponseServiceProviderTest extends ServiceProviderTest
 {
@@ -21,7 +22,13 @@ class ResponseServiceProviderTest extends ServiceProviderTest
         $app = $this->getApp();
 
         $this->setExpects($app, 'make', [Response::class], $response);
-        $this->setExpects($app, 'instance', ['response', $response]);
+        $app->expects($this->exactly(3))
+            ->method('instance')
+            ->withConsecutive(
+                [Response::class, $response],
+                [SymfonyResponse::class, $response],
+                ['response', $response]
+            );
 
         $serviceProvider = new ResponseServiceProvider($app);
         $serviceProvider->register();