Merge branch 'mathmarques-move-add-method' into 3.x

Closes #1634
slimphp · Nov 29, 2015 · e269160 · e269160
2 parents 06675cf + 77aa1d1
commit e269160
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 39 deletions.
diff --git a/Slim/Routable.php b/Slim/Routable.php
@@ -8,6 +8,7 @@
  */
 namespace Slim;
 
+use Closure;
 use Interop\Container\ContainerInterface;
 
 /**
@@ -80,4 +81,22 @@ public function setContainer(ContainerInterface $container)
         $this->container = $container;
         return $this;
     }
+
+    /**
+     * Prepend middleware to the middleware collection
+     *
+     * @param mixed $callable The callback routine
+     *
+     * @return static
+     */
+    public function add($callable)
+    {
+        $callable = $this->resolveCallable($callable);
+        if ($callable instanceof Closure) {
+            $callable = $callable->bindTo($this->container);
+        }
+
+        $this->middleware[] = $callable;
+        return $this;
+    }
 }
diff --git a/Slim/Route.php b/Slim/Route.php
@@ -8,7 +8,6 @@
  */
 namespace Slim;
 
-use Closure;
 use Exception;
 use InvalidArgumentException;
 use Psr\Http\Message\ServerRequestInterface;
@@ -85,26 +84,6 @@ public function __construct($methods, $pattern, $callable, $groups = [], $identi
         $this->identifier = 'route' . $identifier;
     }
 
-    /**
-     * Add middleware
-     *
-     * This method prepends new middleware to the route's middleware stack.
-     *
-     * @param mixed $callable The callback routine
-     *
-     * @return RouteInterface
-     */
-    public function add($callable)
-    {
-        $callable = $this->resolveCallable($callable);
-        if ($callable instanceof Closure) {
-            $callable = $callable->bindTo($this->container);
-        }
-
-        $this->middleware[] = $callable;
-        return $this;
-    }
-
     /**
      * Finalize the route in preparation for dispatching
      */

diff --git a/Slim/RouteGroup.php b/Slim/RouteGroup.php
@@ -30,24 +30,6 @@ public function __construct($pattern, $callable)
         $this->callable = $callable;
     }
 
-    /**
-     * Prepend middleware to the group middleware collection
-     *
-     * @param mixed $callable The callback routine
-     *
-     * @return static
-     */
-    public function add($callable)
-    {
-        $callable = $this->resolveCallable($callable);
-        if ($callable instanceof Closure) {
-            $callable = $callable->bindTo($this->container);
-        }
-
-        $this->middleware[] = $callable;
-        return $this;
-    }
-
     /**
      * Invoke the group to register any Routable objects within it.
      *