Merge pull request #2764 from mapogolions/code_reuse

3.x - Reuse of base class code

Slim/Routable.php

@@ -41,6 +41,16 @@ abstract class Routable
      */
     protected $pattern;
 
+    /**
+     * @param string   $pattern
+     * @param callable $callable
+     */
+    public function __construct($pattern, $callable)
+    {
+        $this->pattern = $pattern;
+        $this->callable = $callable;
+    }
+
     /**
      * Get the middleware registered for the group
      *

Slim/Route.php

@@ -72,13 +72,6 @@ class Route extends Routable implements RouteInterface
      */
     protected $savedArguments = [];
 
-    /**
-     * The callable payload
-     *
-     * @var callable
-     */
-    protected $callable;
-
     /**
      * @param string|string[] $methods The route HTTP methods
      * @param string          $pattern The route pattern
@@ -88,9 +81,8 @@ class Route extends Routable implements RouteInterface
      */
     public function __construct($methods, $pattern, $callable, $groups = [], $identifier = 0)
     {
+        parent::__construct($pattern, $callable);
         $this->methods  = is_string($methods) ? [$methods] : $methods;
-        $this->pattern  = $pattern;
-        $this->callable = $callable;
         $this->groups   = $groups;
         $this->identifier = 'route' . $identifier;
     }

Slim/RouteGroup.php

@@ -12,16 +12,6 @@
 
 class RouteGroup extends Routable implements RouteGroupInterface
 {
-    /**
-     * @param string   $pattern  The pattern prefix for the group
-     * @param callable $callable The group callable
-     */
-    public function __construct($pattern, $callable)
-    {
-        $this->pattern = $pattern;
-        $this->callable = $callable;
-    }
-
     /**
      * {@inheritdoc}
      */