renamed deferredmiddleware to deferredcallable

slimphp · Feb 5, 2016 · 2caf5cc · 2caf5cc
1 parent 88328c1
commit 2caf5cc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/Slim/App.php b/Slim/App.php
@@ -104,7 +104,7 @@ public function getContainer()
      */
     public function add($callable)
     {
-        return $this->addMiddleware(new DeferredMiddleware($callable, $this->container));
+        return $this->addMiddleware(new DeferredCallable($callable, $this->container));
     }
 
     /**
@@ -233,7 +233,7 @@ public function any($pattern, $callable)
      */
     public function map(array $methods, $pattern, $callable)
     {
-        $callable = new DeferredMiddleware($callable, $this->container);
+        $callable = new DeferredCallable($callable, $this->container);
 
         $route = $this->container->get('router')->map($methods, $pattern, $callable);
         if (is_callable([$route, 'setContainer'])) {

diff --git a/Slim/DeferredMiddleware.php → Slim/DeferredCallable.php b/Slim/DeferredMiddleware.php → Slim/DeferredCallable.php
@@ -6,7 +6,7 @@
 use Closure;
 use Interop\Container\ContainerInterface;
 
-class DeferredMiddleware
+class DeferredCallable
 {
     use CallableResolverAwareTrait;
 

diff --git a/Slim/Routable.php b/Slim/Routable.php
@@ -88,7 +88,7 @@ public function setContainer(ContainerInterface $container)
      */
     public function add($callable)
     {
-        $this->middleware[] = new DeferredMiddleware($callable, $this->container);
+        $this->middleware[] = new DeferredCallable($callable, $this->container);
         return $this;
     }
 }
diff --git a/tests/DeferredMiddlewareTest.php → tests/DeferredCallableTest.php b/tests/DeferredMiddlewareTest.php → tests/DeferredCallableTest.php
@@ -4,17 +4,17 @@
 namespace Slim\Tests;
 
 use Slim\Container;
-use Slim\DeferredMiddleware;
+use Slim\DeferredCallable;
 use Slim\Tests\Mocks\CallableTest;
 
-class DeferredMiddlewareTest extends \PHPUnit_Framework_TestCase
+class DeferredCallableTest extends \PHPUnit_Framework_TestCase
 {
     public function testItResolvesCallable()
     {
         $container = new Container();
         $container['CallableTest'] = new CallableTest;
 
-        $deferred = new DeferredMiddleware('CallableTest:toCall', $container);
+        $deferred = new DeferredCallable('CallableTest:toCall', $container);
         $deferred();
 
         $this->assertEquals(1, CallableTest::$CalledCount);
@@ -36,7 +36,7 @@ public function testItBindsClosuresToContainer()
             $test->assertSame($container, $this);
         };
 
-        $deferred = new DeferredMiddleware($closure, $container);
+        $deferred = new DeferredCallable($closure, $container);
         $deferred();
     }
 
@@ -52,7 +52,7 @@ public function testItReturnsInvokedCallableResponse()
             return $bar;
         };
 
-        $deferred = new DeferredMiddleware($closure, $container);
+        $deferred = new DeferredCallable($closure, $container);
 
         $response = $deferred($foo);
         $this->assertEquals($bar, $response);

diff --git a/tests/RouteTest.php b/tests/RouteTest.php
@@ -9,7 +9,7 @@
 namespace Slim\Tests;
 
 use Slim\Container;
-use Slim\DeferredMiddleware;
+use Slim\DeferredCallable;
 use Slim\Http\Body;
 use Slim\Http\Environment;
 use Slim\Http\Headers;
@@ -209,7 +209,7 @@ public function testControllerInContainer()
         $container = new Container();
         $container['CallableTest'] = new CallableTest;
 
-        $deferred = new DeferredMiddleware('CallableTest:toCall', $container);
+        $deferred = new DeferredCallable('CallableTest:toCall', $container);
 
         $route = new Route(['GET'], '/', $deferred);
         $route->setContainer($container);