Merge pull request #2811 from adriansuter/patch-remove-deferred-callable

4.x - Remove `DeferredCallable`
slimphp · Aug 18, 2019 · a139440 · a139440
2 parents 8ab3432 + c638bef
commit a139440
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 121 deletions.
diff --git a/Slim/DeferredCallable.php b/Slim/DeferredCallable.php
diff --git a/tests/DeferredCallableTest.php b/tests/DeferredCallableTest.php
diff --git a/tests/Routing/RouteTest.php b/tests/Routing/RouteTest.php
@@ -17,10 +17,8 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
-use Psr\Http\Message\UriInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Slim\CallableResolver;
-use Slim\DeferredCallable;
 use Slim\Handlers\Strategies\RequestHandler;
 use Slim\Handlers\Strategies\RequestResponse;
 use Slim\Interfaces\CallableResolverInterface;
@@ -390,7 +388,7 @@ public function testControllerMethodAsStringResolvesWithoutContainer()
         $callableResolver = new CallableResolver();
         $responseFactory = $this->getResponseFactory();
 
-        $deferred = new DeferredCallable('\Slim\Tests\Mocks\CallableTest:toCall', $callableResolver);
+        $deferred = $callableResolver->resolve('\Slim\Tests\Mocks\CallableTest:toCall');
         $route = new Route(['GET'], '/', $deferred, $responseFactory, $callableResolver);
 
         CallableTest::$CalledCount = 0;
@@ -410,7 +408,6 @@ public function testControllerMethodAsStringResolvesWithContainer()
         $callableResolverProphecy = $this->prophesize(CallableResolverInterface::class);
 
         $callable = 'CallableTest:toCall';
-        $deferred = new DeferredCallable($callable, $callableResolverProphecy->reveal());
 
         $callableResolverProphecy
             ->resolve($callable)
@@ -426,6 +423,7 @@ public function testControllerMethodAsStringResolvesWithContainer()
             })
             ->shouldBeCalledOnce();
 
+        $deferred = $callableResolverProphecy->reveal()->resolve($callable);
         $callableResolverProphecy
             ->resolve($deferred)
             ->willReturn($deferred)