View GitHub Repository routing

Schedule Inspection
Subscribe
Completed
Push — master ( d708fb...6202fd )
by Sinnarasa
02:37
created
Status
Category
Toggle Patches
src/Routing/RouteCollection.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -42,11 +42,11 @@  discard block
 
 block discarded – undo
42 42 
      */
43 43 
     public function addRoutes($routes = null, $options = [])
44 44 
     {
45 
-        if(!is_null($routes) && !is_array($routes)) {
45 
+        if (!is_null($routes) && !is_array($routes)) {
46 46 
             if (strpos($routes, '.php') === false) $routes = trim($routes, '/') . '/';
47 47 
             if (is_file($routes . '/routes.php') && is_array($routesFile = include $routes . '/routes.php')) $routes = $routesFile;
48 48 
             elseif (is_file($routes) && is_array($routesFile = include $routes)) $routes = $routesFile;
49 
-            else throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "'.$routes.'" given');
49 
+            else throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "' . $routes . '" given');
50 50 
         }
51 51 
         $this->routes['routes_' . $this->countRoutes] = is_array($routes) ? $routes : [];
52 52 
         $this->routes['view_dir_' . $this->countRoutes] = (isset($options['view_dir']) && !empty($options['view_dir'])) ? rtrim($options['view_dir'], '/') . '/' : '';
 
@@ -62,8 +62,8 @@  discard block
 
 block discarded – undo
62 62 
      */
63 63 
     public function getRoutes($key = null)
64 64 
     {
65 
-        if(!is_null($key))
66 
-            return isset($this->routes[$key])?$this->routes[$key]:'';
65 
+        if (!is_null($key))
66 
+            return isset($this->routes[$key]) ? $this->routes[$key] : '';
67 67 
         return $this->routes;
68 68 
     }
69 69 
 
@@ -79,7 +79,7 @@  discard block
 
 block discarded – undo
79 79 
         } elseif (is_string($args))
80 80 
             for ($i = 0; $i < $this->countRoutes; ++$i)
81 81 
                 $this->routes['prefix_' . $i] = '/' . trim($args, '/');
82 
-        if($this->countRoutes == 0)$this->countRoutes++;
82 
+        if ($this->countRoutes == 0)$this->countRoutes++;
83 83 
     }
84 84
85 85 
     /**
 
@@ -89,15 +89,15 @@  discard block
 
 block discarded – undo
89 89 
     {
90 90 
         $nbrArgs = count($args);
91 91 
         for ($i = 0; $i < $nbrArgs; ++$i) {
92 
-            if(is_array($args[$i])){
92 
+            if (is_array($args[$i])) {
93 93 
                 $this->routes['block_' . $i] = (isset($args[$i]['block']) && !empty($args[$i]['block'])) ? rtrim($args[$i]['block'], '/') . '/' : '';
94 94 
                 $this->routes['view_dir_' . $i] = (isset($args[$i]['view_dir']) && !empty($args[$i]['view_dir'])) ? rtrim($args[$i]['view_dir'], '/') . '/' : '';
95 95 
                 $this->routes['ctrl_namespace_' . $i] = (isset($args[$i]['ctrl_namespace']) && !empty($args[$i]['ctrl_namespace'])) ? trim($args[$i]['ctrl_namespace'], '\\') . '\\' : '';
96 
-                $this->routes['prefix_' . $i] = (isset($args[$i]['prefix']) && !empty($args[$i]['prefix'])) ? '/'.trim($args[$i]['prefix'], '/') : '';
97 
-                if(!isset($this->routes['routes_' . $i]))$this->routes['routes_' . $i] = [];
96 
+                $this->routes['prefix_' . $i] = (isset($args[$i]['prefix']) && !empty($args[$i]['prefix'])) ? '/' . trim($args[$i]['prefix'], '/') : '';
97 
+                if (!isset($this->routes['routes_' . $i]))$this->routes['routes_' . $i] = [];
98 98 
             }
99 99 
         }
100 
-        if($this->countRoutes == 0)$this->countRoutes++;
100 
+        if ($this->countRoutes == 0)$this->countRoutes++;
101 101 
     }
102 102
103 103 
     /**
 
@@ -119,7 +119,7 @@  discard block
 
 block discarded – undo
119 119 
      */
120 120 
     public function generateRoutesPath()
121 121 
     {
122 
-        $root = 'http://' . (isset($_SERVER['HTTP_HOST'])?$_SERVER['HTTP_HOST']:$_SERVER['SERVER_NAME']) . str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']);
122 
+        $root = 'http://' . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']) . str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']);
123 123 
         $count = 0;
124 124 
         for ($i = 0; $i < $this->countRoutes; ++$i) {
125 125 
             $prefix = (isset($this->routes['prefix_' . $i])) ? $this->routes['prefix_' . $i] : '';
 
@@ -127,7 +127,7 @@  discard block
 
 block discarded – undo
127 127 
                 foreach ($this->routes['routes_' . $i] as $route => $dependencies) {
128 128 
                     if (is_array($dependencies) && isset($dependencies['use']))
129 129 
                         $use = (is_callable($dependencies['use'])) ? 'closure-' . $count : trim($dependencies['use'], '/');
130 
-                    elseif(!is_array($dependencies))
130 
+                    elseif (!is_array($dependencies))
131 131 
                         $use = (is_callable($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');
132 132 
                     else
133 133 
                         $use = $route;
Please login to merge, or discard this patch.
Braces   +60 added lines, -31 removed lines patch added patch discarded remove patch 
@@ -33,7 +33,9 @@  discard block
 
 block discarded – undo
33 33 
      */
34 34 
     public function __construct($routes = null, $options = [])
35 35 
     {
36 
-        if (!is_null($routes) || !empty($options)) $this->addRoutes($routes, $options);
36 
+        if (!is_null($routes) || !empty($options)) {
37 
+            $this->addRoutes($routes, $options);
38 
+        }
37 39 
     }
38 40
39 41 
     /**
 
@@ -43,10 +45,16 @@  discard block
 
 block discarded – undo
43 45 
     public function addRoutes($routes = null, $options = [])
44 46 
     {
45 47 
         if(!is_null($routes) && !is_array($routes)) {
46 
-            if (strpos($routes, '.php') === false) $routes = trim($routes, '/') . '/';
47 
-            if (is_file($routes . '/routes.php') && is_array($routesFile = include $routes . '/routes.php')) $routes = $routesFile;
48 
-            elseif (is_file($routes) && is_array($routesFile = include $routes)) $routes = $routesFile;
49 
-            else throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "'.$routes.'" given');
48 
+            if (strpos($routes, '.php') === false) {
49 
+                $routes = trim($routes, '/') . '/';
50 
+            }
51 
+            if (is_file($routes . '/routes.php') && is_array($routesFile = include $routes . '/routes.php')) {
52 
+                $routes = $routesFile;
53 
+            } elseif (is_file($routes) && is_array($routesFile = include $routes)) {
54 
+                $routes = $routesFile;
55 
+            } else {
56 
+                throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "'.$routes.'" given');
57 
+            }
50 58 
         }
51 59 
         $this->routes['routes_' . $this->countRoutes] = is_array($routes) ? $routes : [];
52 60 
         $this->routes['view_dir_' . $this->countRoutes] = (isset($options['view_dir']) && !empty($options['view_dir'])) ? rtrim($options['view_dir'], '/') . '/' : '';
 
@@ -62,8 +70,9 @@  discard block
 
 block discarded – undo
62 70 
      */
63 71 
     public function getRoutes($key = null)
64 72 
     {
65 
-        if(!is_null($key))
66 
-            return isset($this->routes[$key])?$this->routes[$key]:'';
73 
+        if(!is_null($key)) {
74 
+                    return isset($this->routes[$key])?$this->routes[$key]:'';
75 
+        }
67 76 
         return $this->routes;
68 77 
     }
69 78 
 
@@ -74,12 +83,18 @@  discard block
 
 block discarded – undo
74 83 
     {
75 84 
         if (is_array($args)) {
76 85 
             $nbrArgs = count($args);
77 
-            for ($i = 0; $i < $nbrArgs; ++$i)
78 
-                $this->routes['prefix_' . $i] = '/' . trim($args[$i], '/');
79 
-        } elseif (is_string($args))
80 
-            for ($i = 0; $i < $this->countRoutes; ++$i)
81 
-                $this->routes['prefix_' . $i] = '/' . trim($args, '/');
82 
-        if($this->countRoutes == 0)$this->countRoutes++;
86 
+            for ($i = 0; $i < $nbrArgs; ++$i) {
87 
+                            $this->routes['prefix_' . $i] = '/' . trim($args[$i], '/');
88 
+            }
89 
+        } elseif (is_string($args)) {
90 
+                    for ($i = 0;
91 
+        }
92 
+        $i < $this->countRoutes; ++$i) {
93 
+                            $this->routes['prefix_' . $i] = '/' . trim($args, '/');
94 
+            }
95 
+        if($this->countRoutes == 0) {
96 
+            $this->countRoutes++;
97 
+        }
83 98 
     }
84 99
85 100 
     /**
 
@@ -94,10 +109,14 @@  discard block
 
 block discarded – undo
94 109 
                 $this->routes['view_dir_' . $i] = (isset($args[$i]['view_dir']) && !empty($args[$i]['view_dir'])) ? rtrim($args[$i]['view_dir'], '/') . '/' : '';
95 110 
                 $this->routes['ctrl_namespace_' . $i] = (isset($args[$i]['ctrl_namespace']) && !empty($args[$i]['ctrl_namespace'])) ? trim($args[$i]['ctrl_namespace'], '\\') . '\\' : '';
96 111 
                 $this->routes['prefix_' . $i] = (isset($args[$i]['prefix']) && !empty($args[$i]['prefix'])) ? '/'.trim($args[$i]['prefix'], '/') : '';
97 
-                if(!isset($this->routes['routes_' . $i]))$this->routes['routes_' . $i] = [];
112 
+                if(!isset($this->routes['routes_' . $i])) {
113 
+                    $this->routes['routes_' . $i] = [];
114 
+                }
98 115 
             }
99 116 
         }
100 
-        if($this->countRoutes == 0)$this->countRoutes++;
117 
+        if($this->countRoutes == 0) {
118 
+            $this->countRoutes++;
119 
+        }
101 120 
     }
102 121
103 122 
     /**
 
@@ -106,12 +125,16 @@  discard block
 
 block discarded – undo
106 125 
      */
107 126 
     public function setMiddleware($middleware)
108 127 
     {
109 
-        if (is_string($middleware)) $middleware = rtrim($middleware, '/');
110 
-        if (is_array($middleware))
111 
-            $this->middleware = $middleware;
112 
-        elseif (is_file($middleware) && is_array($mid = include $middleware))
113 
-            $this->middleware = $mid;
114 
-        else throw new \InvalidArgumentException('Accepted argument for setMiddleware are array and array file');
128 
+        if (is_string($middleware)) {
129 
+            $middleware = rtrim($middleware, '/');
130 
+        }
131 
+        if (is_array($middleware)) {
132 
+                    $this->middleware = $middleware;
133 
+        } elseif (is_file($middleware) && is_array($mid = include $middleware)) {
134 
+                    $this->middleware = $mid;
135 
+        } else {
136 
+            throw new \InvalidArgumentException('Accepted argument for setMiddleware are array and array file');
137 
+        }
115 138 
     }
116 139
117 140 
     /**
 
@@ -123,14 +146,15 @@  discard block
 
 block discarded – undo
123 146 
         $count = 0;
124 147 
         for ($i = 0; $i < $this->countRoutes; ++$i) {
125 148 
             $prefix = (isset($this->routes['prefix_' . $i])) ? $this->routes['prefix_' . $i] : '';
126 
-            if (isset($this->routes['routes_' . $i]))
127 
-                foreach ($this->routes['routes_' . $i] as $route => $dependencies) {
149 
+            if (isset($this->routes['routes_' . $i])) {
150 
+                            foreach ($this->routes['routes_' . $i] as $route => $dependencies) {
128 151 
                     if (is_array($dependencies) && isset($dependencies['use']))
129 
-                        $use = (is_callable($dependencies['use'])) ? 'closure-' . $count : trim($dependencies['use'], '/');
130 
-                    elseif(!is_array($dependencies))
131 
-                        $use = (is_callable($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');
132 
-                    else
133 
-                        $use = $route;
152 
+                        $use = (is_callable($dependencies['use'])) ? 'closure-' . $count : trim($dependencies['use'], '/');
153 
+            } elseif(!is_array($dependencies)) {
154 
+                                            $use = (is_callable($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');
155 
+                    } else {
156 
+                                            $use = $route;
157 
+                    }
134 158 
                     (!is_callable($dependencies) && isset($dependencies['name'])) ? $this->routesByName[$use . '#' . $dependencies['name']] = $root . $prefix . $route : $this->routesByName[$use] = $root . $prefix . $route;
135 159 
                     $count++;
136 160 
                 }
 
@@ -147,9 +171,14 @@  discard block
 
 block discarded – undo
147 171 
     {
148 172 
         foreach ($this->routesByName as $key => $route) {
149 173 
             $param = explode('#', $key);
150 
-            foreach ($params as $key2 => $value) $route = str_replace(':' . $key2, $value, $route);
151 
-            if ($param[0] == trim($name, '/')) return $route;
152 
-            else if (isset($param[1]) && $param[1] == $name) return $route;
174 
+            foreach ($params as $key2 => $value) {
175 
+                $route = str_replace(':' . $key2, $value, $route);
176 
+            }
177 
+            if ($param[0] == trim($name, '/')) {
178 
+                return $route;
179 
+            } else if (isset($param[1]) && $param[1] == $name) {
180 
+                return $route;
181 
+            }
153 182 
         }
154 183 
         return null;
155 184 
     }
Please login to merge, or discard this patch.
src/Routing/Middleware.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -76,8 +76,8 @@  discard block
 
 block discarded – undo
76 76 
      * @param $class
77 77 
      * @return mixed
78 78 
      */
79 
-    private function callHandler($class){
80 
-        $instance = call_user_func($this->router->getConfig()['di'],$class);
79 
+    private function callHandler($class) {
80 
+        $instance = call_user_func($this->router->getConfig()['di'], $class);
81 81 
         if (method_exists($instance, 'handle')) {
82 82 
             $reflectionMethod = new ReflectionMethod($instance, 'handle');
83 83 
             $dependencies = [];
 
@@ -93,8 +93,8 @@  discard block
 
 block discarded – undo
93 93 
      * @param $class
94 94 
      * @return Route|RouteCollection|Router|mixed
95 95 
      */
96 
-    private function getClass($class){
97 
-        switch($class){
96 
+    private function getClass($class) {
97 
+        switch ($class) {
98 98 
             case 'JetFire\Routing\Route':
99 99 
                 return $this->router->route;
100 100 
                 break;
 
@@ -105,7 +105,7 @@  discard block
 
 block discarded – undo
105 105 
                 return $this->router->collection;
106 106 
                 break;
107 107 
             default:
108 
-                return call_user_func_array($this->router->getConfig()['di'],[$class]);
108 
+                return call_user_func_array($this->router->getConfig()['di'], [$class]);
109 109 
                 break;
110 110 
         }
111 111 
     }
Please login to merge, or discard this patch.
Braces   +16 added lines, -12 removed lines patch added patch discarded remove patch 
@@ -29,9 +29,10 @@  discard block
 
 block discarded – undo
29 29 
      */
30 30 
     public function globalMiddleware()
31 31 
     {
32 
-        if (isset($this->router->collection->middleware['global_middleware']))
33 
-            foreach ($this->router->collection->middleware['global_middleware'] as $class)
34 
-                if (class_exists($class)) $this->callHandler($class);
32 
+        if (isset($this->router->collection->middleware['global_middleware'])) {
33 
+                    foreach ($this->router->collection->middleware['global_middleware'] as $class)
34 
+                if (class_exists($class)) $this->callHandler($class);
35 
+        }
35 36 
     }
36 37
37 38 
     /**
 
@@ -39,9 +40,10 @@  discard block
 
 block discarded – undo
39 40 
      */
40 41 
     public function blockMiddleware()
41 42 
     {
42 
-        if (isset($this->router->collection->middleware['block_middleware']))
43 
-            if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')]) && class_exists($this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')])) {
44 
-                $class = $this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')];
43 
+        if (isset($this->router->collection->middleware['block_middleware'])) {
44 
+                    if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')]) && class_exists($this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')])) {
45 
+                $class = $this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')];
46 
+        }
45 47 
                 $this->callHandler($class);
46 48 
             }
47 49 
     }
 
@@ -65,9 +67,10 @@  discard block
 
 block discarded – undo
65 67 
      */
66 68 
     public function routeMiddleware()
67 69 
     {
68 
-        if (isset($this->router->collection->middleware['route_middleware']))
69 
-            if (isset($this->router->route->getPath()['middleware']) && class_exists($this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']])) {
70 
-                $class = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']];
70 
+        if (isset($this->router->collection->middleware['route_middleware'])) {
71 
+                    if (isset($this->router->route->getPath()['middleware']) && class_exists($this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']])) {
72 
+                $class = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']];
73 
+        }
71 74 
                 $this->callHandler($class);
72 75 
             }
73 76 
     }
 
@@ -81,9 +84,10 @@  discard block
 
 block discarded – undo
81 84 
         if (method_exists($instance, 'handle')) {
82 85 
             $reflectionMethod = new ReflectionMethod($instance, 'handle');
83 86 
             $dependencies = [];
84 
-            foreach ($reflectionMethod->getParameters() as $arg)
85 
-                if (!is_null($arg->getClass()))
86 
-                    $dependencies[] = $this->getClass($arg->getClass()->name);
87 
+            foreach ($reflectionMethod->getParameters() as $arg) {
88 
+                            if (!is_null($arg->getClass()))
89 
+                    $dependencies[] = $this->getClass($arg->getClass()->name);
90 
+            }
87 91 
             $dependencies = array_merge($dependencies, [$this->router->route]);
88 92 
             $reflectionMethod->invokeArgs($instance, $dependencies);
89 93 
         }
Please login to merge, or discard this patch.