jetfirephp / routing

src/Routing/Middleware.php

Braces +24 added lines, -13 removed lines

@@ -28,11 +28,14 @@ 
      */
     public function globalMiddleware()
     {
-        if (isset($this->router->collection->middleware['global_middleware']))
-            foreach ($this->router->collection->middleware['global_middleware'] as $mid) {
+        if (isset($this->router->collection->middleware['global_middleware'])) {

+                    foreach ($this->router->collection->middleware['global_middleware'] as $mid) {
                 if (class_exists($mid)) {
-                    $mid_global = new $mid;
-                    if (method_exists($mid_global, 'handle')) $mid_global->handle($this->router->route);
+                    $mid_global = new $mid;

+        }

+                    if (method_exists($mid_global, 'handle')) {

+                        $mid_global->handle($this->router->route);

+                    }

                 }
             }
     }
@@ -42,11 +45,14 @@ 
      */
     public function blockMiddleware()
     {
-        if (isset($this->router->collection->middleware['block_middleware']))
-            if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()]) && class_exists($this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()])) {
-                $class = $this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()];
+        if (isset($this->router->collection->middleware['block_middleware'])) {

+                    if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()]) && class_exists($this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()])) {
+                $class = $this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()];

+        }

                 $mid_block = new $class;
-                if (method_exists($mid_block, 'handle')) $mid_block->handle($this->router->route);
+                if (method_exists($mid_block, 'handle')) {

+                    $mid_block->handle($this->router->route);

+                }

             }
     }
 
@@ -60,7 +66,9 @@ 
             if (isset($this->router->collection->middleware['class_middleware'][$ctrl]) && class_exists($this->router->route->getTarget('controller'))) {
                 $class = $this->router->collection->middleware['class_middleware'][$ctrl];
                 $mid_class = new $class;
-                if (method_exists($mid_class, 'handle')) $mid_class->handle($this->router->route);
+                if (method_exists($mid_class, 'handle')) {

+                    $mid_class->handle($this->router->route);

+                }

             }
         }
     }
@@ -70,11 +78,14 @@ 
      */
     public function routeMiddleware()
     {
-        if (isset($this->router->collection->middleware['route_middleware']))
-            if (isset($this->router->route->getPath()['middleware']) && class_exists($this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']])) {
-                $class = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']];
+        if (isset($this->router->collection->middleware['route_middleware'])) {

+                    if (isset($this->router->route->getPath()['middleware']) && class_exists($this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']])) {
+                $class = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']];

+        }

                 $mid_route = new $class;
-                if (method_exists($mid_route, 'handle')) $mid_route->handle($this->router->route);
+                if (method_exists($mid_route, 'handle')) {

+                    $mid_route->handle($this->router->route);

+                }

             }
     }
 

src/Routing/RouteCollection.php

Spacing +9 added lines, -9 removed lines

@@ -42,11 +42,11 @@ 
      */
     public function addRoutes($routes = null, $options = [])
     {
-        if(!is_null($routes) && !is_array($routes)) {
+        if (!is_null($routes) && !is_array($routes)) {
             if (strpos($routes, '.php') === false) $routes = trim($routes, '/') . '/';
             if (is_file($routes . '/routes.php') && is_array($routesFile = include $routes . '/routes.php')) $routes = $routesFile;
             elseif (is_file($routes) && is_array($routesFile = include $routes)) $routes = $routesFile;
-            else throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "'.$routes.'" given');
+            else throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "' . $routes . '" given');
         }
         $this->routes['routes_' . $this->countRoutes] = is_array($routes) ? $routes : [];
         $this->routes['path_' . $this->countRoutes] = (isset($options['path']) && !empty($options['path'])) ? rtrim($options['path'], '/') . '/' : '';
@@ -61,8 +61,8 @@ 
      */
     public function getRoutes($key = null)
     {
-        if(!is_null($key))
-            return isset($this->routes[$key])?$this->routes[$key]:'';
+        if (!is_null($key))
+            return isset($this->routes[$key]) ? $this->routes[$key] : '';
         return $this->routes;
     }
 
@@ -78,7 +78,7 @@ 
         } elseif (is_string($args))
             for ($i = 0; $i < $this->countRoutes; ++$i)
                 $this->routes['prefix_' . $i] = '/' . trim($args, '/');
-        if($this->countRoutes == 0)$this->countRoutes++;
+        if ($this->countRoutes == 0)$this->countRoutes++;
     }
 
     /**
@@ -88,14 +88,14 @@ 
     {
         $nbrArgs = count($args);
         for ($i = 0; $i < $nbrArgs; ++$i) {
-            if(is_array($args[$i])){
+            if (is_array($args[$i])) {
                 $this->routes['path_' . $i] = (isset($args[$i]['path']) && !empty($args[$i]['path'])) ? rtrim($args[$i]['path'], '/') . '/' : '';
                 $this->routes['namespace_' . $i] = (isset($args[$i]['namespace']) && !empty($args[$i]['namespace'])) ? trim($args[$i]['namespace'], '\\') . '\\' : '';
-                $this->routes['prefix_' . $i] = (isset($args[$i]['prefix']) && !empty($args[$i]['prefix'])) ? '/'.trim($args[$i]['prefix'], '/') : '';
-                if(!isset($this->routes['routes_' . $i]))$this->routes['routes_' . $i] = [];
+                $this->routes['prefix_' . $i] = (isset($args[$i]['prefix']) && !empty($args[$i]['prefix'])) ? '/' . trim($args[$i]['prefix'], '/') : '';
+                if (!isset($this->routes['routes_' . $i]))$this->routes['routes_' . $i] = [];
             }
         }
-        if($this->countRoutes == 0)$this->countRoutes++;
+        if ($this->countRoutes == 0)$this->countRoutes++;
     }
 
     /**

Braces +58 added lines, -29 removed lines

@@ -33,7 +33,9 @@ 
      */
     public function __construct($routes = null, $options = [])
     {
-        if (!is_null($routes) || !empty($options)) $this->addRoutes($routes, $options);
+        if (!is_null($routes) || !empty($options)) {

+            $this->addRoutes($routes, $options);

+        }

     }
 
     /**
@@ -43,10 +45,16 @@ 
     public function addRoutes($routes = null, $options = [])
     {
         if(!is_null($routes) && !is_array($routes)) {
-            if (strpos($routes, '.php') === false) $routes = trim($routes, '/') . '/';
-            if (is_file($routes . '/routes.php') && is_array($routesFile = include $routes . '/routes.php')) $routes = $routesFile;
-            elseif (is_file($routes) && is_array($routesFile = include $routes)) $routes = $routesFile;
-            else throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "'.$routes.'" given');
+            if (strpos($routes, '.php') === false) {

+                $routes = trim($routes, '/') . '/';

+            }

+            if (is_file($routes . '/routes.php') && is_array($routesFile = include $routes . '/routes.php')) {

+                $routes = $routesFile;

+            } elseif (is_file($routes) && is_array($routesFile = include $routes)) {

+                $routes = $routesFile;

+            } else {

+                throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "'.$routes.'" given');

+            }

         }
         $this->routes['routes_' . $this->countRoutes] = is_array($routes) ? $routes : [];
         $this->routes['path_' . $this->countRoutes] = (isset($options['path']) && !empty($options['path'])) ? rtrim($options['path'], '/') . '/' : '';
@@ -61,8 +69,9 @@ 
      */
     public function getRoutes($key = null)
     {
-        if(!is_null($key))
-            return isset($this->routes[$key])?$this->routes[$key]:'';
+        if(!is_null($key)) {

+                    return isset($this->routes[$key])?$this->routes[$key]:'';

+        }

         return $this->routes;
     }
 
@@ -73,12 +82,18 @@ 
     {
         if (is_array($args)) {
             $nbrArgs = count($args);
-            for ($i = 0; $i < $nbrArgs; ++$i)
-                $this->routes['prefix_' . $i] = '/' . trim($args[$i], '/');
-        } elseif (is_string($args))
-            for ($i = 0; $i < $this->countRoutes; ++$i)
-                $this->routes['prefix_' . $i] = '/' . trim($args, '/');
-        if($this->countRoutes == 0)$this->countRoutes++;
+            for ($i = 0; $i < $nbrArgs; ++$i) {

+                            $this->routes['prefix_' . $i] = '/' . trim($args[$i], '/');

+            }

+        } elseif (is_string($args)) {

+                    for ($i = 0;

+        }

+        $i < $this->countRoutes; ++$i) {

+                            $this->routes['prefix_' . $i] = '/' . trim($args, '/');

+            }

+        if($this->countRoutes == 0) {

+            $this->countRoutes++;

+        }

     }
 
     /**
@@ -92,10 +107,14 @@ 
                 $this->routes['path_' . $i] = (isset($args[$i]['path']) && !empty($args[$i]['path'])) ? rtrim($args[$i]['path'], '/') . '/' : '';
                 $this->routes['namespace_' . $i] = (isset($args[$i]['namespace']) && !empty($args[$i]['namespace'])) ? trim($args[$i]['namespace'], '\\') . '\\' : '';
                 $this->routes['prefix_' . $i] = (isset($args[$i]['prefix']) && !empty($args[$i]['prefix'])) ? '/'.trim($args[$i]['prefix'], '/') : '';
-                if(!isset($this->routes['routes_' . $i]))$this->routes['routes_' . $i] = [];
+                if(!isset($this->routes['routes_' . $i])) {

+                    $this->routes['routes_' . $i] = [];

+                }

             }
         }
-        if($this->countRoutes == 0)$this->countRoutes++;
+        if($this->countRoutes == 0) {

+            $this->countRoutes++;

+        }

     }
 
     /**
@@ -104,12 +123,16 @@ 
      */
     public function setMiddleware($middleware)
     {
-        if (is_string($middleware)) $middleware = rtrim($middleware, '/');
-        if (is_file($middleware) && is_array($mid = include $middleware))
-            $this->middleware = $mid;
-        elseif (is_array($middleware))
-            $this->middleware = $middleware;
-        else throw new \InvalidArgumentException('Accepted argument for setMiddleware are array and array file');
+        if (is_string($middleware)) {

+            $middleware = rtrim($middleware, '/');

+        }

+        if (is_file($middleware) && is_array($mid = include $middleware)) {

+                    $this->middleware = $mid;

+        } elseif (is_array($middleware)) {

+                    $this->middleware = $middleware;

+        } else {

+            throw new \InvalidArgumentException('Accepted argument for setMiddleware are array and array file');

+        }

     }
 
     /**
@@ -121,12 +144,13 @@ 
         $count = 0;
         for ($i = 0; $i < $this->countRoutes; ++$i) {
             $prefix = (isset($this->routes['prefix_' . $i])) ? $this->routes['prefix_' . $i] : '';
-            if (isset($this->routes['routes_' . $i]))
-                foreach ($this->routes['routes_' . $i] as $route => $dependencies) {
+            if (isset($this->routes['routes_' . $i])) {

+                            foreach ($this->routes['routes_' . $i] as $route => $dependencies) {
                     if (is_array($dependencies) && isset($dependencies['use']))
-                        $use = (is_object($dependencies['use'])) ? 'closure-' . $count : trim($dependencies['use'], '/');
-                    else
-                        $use = (is_object($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');
+                        $use = (is_object($dependencies['use'])) ? 'closure-' . $count : trim($dependencies['use'], '/');

+            } else {

+                                            $use = (is_object($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');

+                    }

                     (!is_object($dependencies) && isset($dependencies['name'])) ? $this->routesByName[$use . '#' . $dependencies['name']] = $root . $prefix . $route : $this->routesByName[$use] = $root . $prefix . $route;
                     $count++;
                 }
@@ -143,9 +167,14 @@ 
     {
         foreach ($this->routesByName as $key => $route) {
             $param = explode('#', $key);
-            foreach ($params as $key2 => $value) $route = str_replace(':' . $key2, $value, $route);
-            if ($param[0] == trim($name, '/')) return $route;
-            else if (isset($param[1]) && $param[1] == $name) return $route;
+            foreach ($params as $key2 => $value) {

+                $route = str_replace(':' . $key2, $value, $route);

+            }

+            if ($param[0] == trim($name, '/')) {

+                return $route;

+            } else if (isset($param[1]) && $param[1] == $name) {

+                return $route;

+            }

         }
         return null;
     }

src/Routing/Response.php

Spacing +24 added lines, -24 removed lines

@@ -7,7 +7,7 @@ 
  * Class Response
  * @package JetFire\Routing
  */
-class Response implements ResponseInterface{
+class Response implements ResponseInterface {
 
     /**
      * @var array
@@ -53,7 +53,7 @@ 
     public static $statusTexts = array(
         100 => 'Continue',
         101 => 'Switching Protocols',
-        102 => 'Processing',            // RFC2518
+        102 => 'Processing', // RFC2518
         200 => 'OK',
         201 => 'Created',
         202 => 'Accepted',
@@ -61,9 +61,9 @@ 
         204 => 'No Content',
         205 => 'Reset Content',
         206 => 'Partial Content',
-        207 => 'Multi-Status',          // RFC4918
-        208 => 'Already Reported',      // RFC5842
-        226 => 'IM Used',               // RFC3229
+        207 => 'Multi-Status', // RFC4918
+        208 => 'Already Reported', // RFC5842
+        226 => 'IM Used', // RFC3229
         300 => 'Multiple Choices',
         301 => 'Moved Permanently',
         302 => 'Found',
@@ -71,7 +71,7 @@ 
         304 => 'Not Modified',
         305 => 'Use Proxy',
         307 => 'Temporary Redirect',
-        308 => 'Permanent Redirect',    // RFC7238
+        308 => 'Permanent Redirect', // RFC7238
         400 => 'Bad Request',
         401 => 'Unauthorized',
         402 => 'Payment Required',
@@ -90,26 +90,26 @@ 
         415 => 'Unsupported Media Type',
         416 => 'Range Not Satisfiable',
         417 => 'Expectation Failed',
-        418 => 'I\'m a teapot',                                               // RFC2324
-        422 => 'Unprocessable Entity',                                        // RFC4918
-        423 => 'Locked',                                                      // RFC4918
-        424 => 'Failed Dependency',                                           // RFC4918
-        425 => 'Reserved for WebDAV advanced collections expired proposal',   // RFC2817
-        426 => 'Upgrade Required',                                            // RFC2817
-        428 => 'Precondition Required',                                       // RFC6585
-        429 => 'Too Many Requests',                                           // RFC6585
-        431 => 'Request Header Fields Too Large',                             // RFC6585
+        418 => 'I\'m a teapot', // RFC2324
+        422 => 'Unprocessable Entity', // RFC4918
+        423 => 'Locked', // RFC4918
+        424 => 'Failed Dependency', // RFC4918
+        425 => 'Reserved for WebDAV advanced collections expired proposal', // RFC2817
+        426 => 'Upgrade Required', // RFC2817
+        428 => 'Precondition Required', // RFC6585
+        429 => 'Too Many Requests', // RFC6585
+        431 => 'Request Header Fields Too Large', // RFC6585
         500 => 'Internal Server Error',
         501 => 'Not Implemented',
         502 => 'Bad Gateway',
         503 => 'Service Unavailable',
         504 => 'Gateway Timeout',
         505 => 'HTTP Version Not Supported',
-        506 => 'Variant Also Negotiates (Experimental)',                      // RFC2295
-        507 => 'Insufficient Storage',                                        // RFC4918
-        508 => 'Loop Detected',                                               // RFC5842
-        510 => 'Not Extended',                                                // RFC2774
-        511 => 'Network Authentication Required',                             // RFC6585
+        506 => 'Variant Also Negotiates (Experimental)', // RFC2295
+        507 => 'Insufficient Storage', // RFC4918
+        508 => 'Loop Detected', // RFC5842
+        510 => 'Not Extended', // RFC2774
+        511 => 'Network Authentication Required', // RFC6585
     );
 
     /**
@@ -144,8 +144,8 @@ 
     public function __toString()
     {
         return
-            sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText)."\r\n".
-            $this->headers."\r\n".
+            sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText) . "\r\n" .
+            $this->headers . "\r\n" .
             $this->getContent();
     }
 
@@ -166,8 +166,8 @@ 
      */
     public function sendHeaders()
     {
-        foreach($this->headers as $key => $content)
-            header($key.' : '.$content);
+        foreach ($this->headers as $key => $content)
+            header($key . ' : ' . $content);
         http_response_code($this->getStatusCode());
         return $this;
     }

Braces +3 added lines, -2 removed lines

@@ -166,8 +166,9 @@
      */
     public function sendHeaders()
     {
-        foreach($this->headers as $key => $content)
-            header($key.' : '.$content);
+        foreach($this->headers as $key => $content) {

+                    header($key.' : '.$content);

+        }

         http_response_code($this->getStatusCode());
         return $this;
     }

src/Routing/Dispatcher/TemplateDispatcher.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
     /**
      * @param Route $route
      */
-    public function __construct(Route $route,ResponseInterface $response)
+    public function __construct(Route $route, ResponseInterface $response)
     {
         $this->route = $route;
         $this->response = $response;
@@ -58,7 +58,7 @@ 
     /**
      * @param $extension
      */
-    public function setContentType($extension){
+    public function setContentType($extension) {
         $this->response->setStatusCode(200);
         isset($this->types[$extension])
             ? $this->response->setHeaders(['Content-Type' => $this->types[$extension]])

Braces +6 added lines, -5 removed lines

@@ -47,11 +47,12 @@
      */
     public function call()
     {
-        if ($this->response->getStatusCode() == 202)
-            $this->setContentType($this->route->getTarget('extension'));
-        if (isset($this->route->getTarget()['callback'][$this->route->getTarget('extension')]))
-            $this->response->setContent(call_user_func_array($this->route->getTarget()['callback'][$this->route->getTarget('extension')], [$this->route]));
-        else {
+        if ($this->response->getStatusCode() == 202) {

+                    $this->setContentType($this->route->getTarget('extension'));

+        }

+        if (isset($this->route->getTarget()['callback'][$this->route->getTarget('extension')])) {

+                    $this->response->setContent(call_user_func_array($this->route->getTarget()['callback'][$this->route->getTarget('extension')], [$this->route]));

+        } else {
             ob_start();
             require($this->route->getTarget('template'));
             $this->response->setContent(ob_get_clean());

src/Routing/Dispatcher/DispatcherInterface.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     /**
      * @param Route $route
      */
-    public function __construct(Route $route,ResponseInterface $response);
+    public function __construct(Route $route, ResponseInterface $response);
 
     /**
      * @return mixed

src/Routing/Dispatcher/ControllerDispatcher.php

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
     /**
      * @param Route $route
      */
-    public function __construct(Route $route,ResponseInterface $response)
+    public function __construct(Route $route, ResponseInterface $response)
     {
         $this->route = $route;
         $this->response = $response;
@@ -45,7 +45,7 @@ 
         foreach ($reflectionMethod->getParameters() as $arg) {
             if (!is_null($arg->getClass())) {
                 $class = $arg->getClass()->name;
-                array_unshift($dependencies, call_user_func_array($this->route->getTarget('di'),[$class]));
+                array_unshift($dependencies, call_user_func_array($this->route->getTarget('di'), [$class]));
             }
         }
         if ($this->response->getStatusCode() == 202)
@@ -66,13 +66,13 @@ 
         $constructor = $reflector->getConstructor();
         if (is_null($constructor)) {
             $class = $this->route->getTarget('controller');
-            return call_user_func_array($this->route->getTarget('di'),[$class]);
+            return call_user_func_array($this->route->getTarget('di'), [$class]);
         }
         $dependencies = $constructor->getParameters();
         $arguments = [];
         foreach ($dependencies as $dep) {
             $class = $dep->getClass()->name;
-            array_push($arguments, call_user_func_array($this->route->getTarget('di'),[$class]));
+            array_push($arguments, call_user_func_array($this->route->getTarget('di'), [$class]));
         }
         return $reflector->newInstanceArgs($arguments);
     }

Braces +6 added lines, -4 removed lines

@@ -48,8 +48,9 @@ 
                 array_unshift($dependencies, call_user_func_array($this->route->getTarget('di'),[$class]));
             }
         }
-        if ($this->response->getStatusCode() == 202)
-            $this->response->setStatusCode(200);
+        if ($this->response->getStatusCode() == 202) {

+                    $this->response->setStatusCode(200);

+        }

         return $this->response->setContent($reflectionMethod->invokeArgs($this->getController(), $dependencies));
     }
 
@@ -61,8 +62,9 @@ 
     private function getController()
     {
         $reflector = new ReflectionClass($this->route->getTarget('controller'));
-        if (!$reflector->isInstantiable())
-            throw new \Exception('Target [' . $this->route->getTarget('controller') . '] is not instantiable.');
+        if (!$reflector->isInstantiable()) {

+                    throw new \Exception('Target [' . $this->route->getTarget('controller') . '] is not instantiable.');

+        }

         $constructor = $reflector->getConstructor();
         if (is_null($constructor)) {
             $class = $this->route->getTarget('controller');

src/Routing/Dispatcher/ClosureDispatcher.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
     /**
      * @param Route $route
      */
-    public function __construct(Route $route,ResponseInterface $response)
+    public function __construct(Route $route, ResponseInterface $response)
     {
         $this->route = $route;
         $this->response = $response;

src/Routing/Route.php

Spacing +3 added lines, -3 removed lines

@@ -127,7 +127,7 @@ 
      */
     public function setDetail($detail)
     {
-        $this->detail = array_merge($detail,$this->detail);
+        $this->detail = array_merge($detail, $this->detail);
     }
 
     /**
@@ -173,8 +173,8 @@ 
     /**
      * @return array
      */
-    public function getData(){
-        return (isset($this->getDetail()['data']) && is_array($this->getDetail()['data']))?$this->getDetail()['data']:[];
+    public function getData() {
+        return (isset($this->getDetail()['data']) && is_array($this->getDetail()['data'])) ? $this->getDetail()['data'] : [];
     }
 
     /**

Braces +18 added lines, -8 removed lines

@@ -52,10 +52,18 @@ 
      */
     public function set($args = [])
     {
-        if (isset($args['name'])) $this->name = $args['name'];
-        if (isset($args['callback'])) $this->callback = $args['callback'];
-        if (isset($args['target'])) $this->target = $args['target'];
-        if (isset($args['detail'])) $this->detail = $args['detail'];
+        if (isset($args['name'])) {

+            $this->name = $args['name'];

+        }

+        if (isset($args['callback'])) {

+            $this->callback = $args['callback'];

+        }

+        if (isset($args['target'])) {

+            $this->target = $args['target'];

+        }

+        if (isset($args['detail'])) {

+            $this->detail = $args['detail'];

+        }

     }
 
     /**
@@ -145,8 +153,9 @@ 
      */
     public function getTarget($key = null)
     {
-        if (!is_null($key))
-            return isset($this->target[$key]) ? $this->target[$key] : '';
+        if (!is_null($key)) {

+                    return isset($this->target[$key]) ? $this->target[$key] : '';

+        }

         return empty($this->target) ? '' : $this->target;
     }
 
@@ -165,8 +174,9 @@ 
      */
     public function hasTarget($key = null)
     {
-        if (!is_null($key))
-            return isset($this->target[$key]) ? true : false;
+        if (!is_null($key)) {

+                    return isset($this->target[$key]) ? true : false;

+        }

         return empty($this->target) ? false : true;
     }
 

src/Routing/Router.php

Spacing +9 added lines, -9 removed lines

@@ -46,13 +46,13 @@ 
      * @param ResponseInterface $response
      * @param Route $route
      */
-    public function __construct(RouteCollection $collection,ResponseInterface $response = null,Route $route = null)
+    public function __construct(RouteCollection $collection, ResponseInterface $response = null, Route $route = null)
     {
         $this->collection = $collection;
-        $this->response = is_null($response)? new Response() : $response;
+        $this->response = is_null($response) ? new Response() : $response;
         $this->response->setStatusCode(404);
-        $this->route = is_null($route)? new Route() : $route;
-        $this->config['di'] = function($class){
+        $this->route = is_null($route) ? new Route() : $route;
+        $this->config['di'] = function($class) {
             return new $class;
         };
     }
@@ -76,7 +76,7 @@ 
     /**
      * @param string $matcher
      */
-    public function addMatcher($matcher){
+    public function addMatcher($matcher) {
         $this->config['matcher'][] = $matcher;
     }
 
@@ -123,7 +123,7 @@ 
     public function callTarget()
     {
         $target = $this->route->getTarget('dispatcher');
-        if(!empty($target)) {
+        if (!empty($target)) {
             $this->dispatcher = new $target($this->route, $this->response);
             return call_user_func([$this->dispatcher, 'call']);
         }
@@ -157,12 +157,12 @@ 
     {
         if (isset($this->route->getDetail()['response_templates']) && isset($this->route->getDetail()['response_templates'][$code = $this->response->getStatusCode()])) {
             $this->route->setCallback($this->route->getDetail()['response_templates'][$code]);
-            if(!isset($this->config['matcherInstance']))
+            if (!isset($this->config['matcherInstance']))
                 foreach ($this->config['matcher'] as $matcher)
                     $this->config['matcherInstance'][$matcher] = new $matcher($this);
-            foreach($this->config['matcherInstance'] as $instance) {
+            foreach ($this->config['matcherInstance'] as $instance) {
                 foreach (call_user_func([$instance, 'getMatcher']) as $match)
-                    if (call_user_func([$instance, $match])){ $this->callTarget(); break; }
+                    if (call_user_func([$instance, $match])) { $this->callTarget(); break; }
             }
             $this->response->setStatusCode($code);
         }

Braces +17 added lines, -10 removed lines

@@ -86,7 +86,9 @@ 
     public function run()
     {
         $this->setUrl();
-        if ($this->config['generateRoutesPath']) $this->collection->generateRoutesPath();
+        if ($this->config['generateRoutesPath']) {

+            $this->collection->generateRoutesPath();

+        }

         if ($this->match()) {
             $this->handle();
             $this->callTarget();
@@ -99,8 +101,9 @@ 
      */
     public function setUrl($url = null)
     {
-        if (is_null($url))
-            $url = (isset($_GET['url'])) ? $_GET['url'] : substr(str_replace(str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']), '', $_SERVER['REQUEST_URI']), 1);
+        if (is_null($url)) {

+                    $url = (isset($_GET['url'])) ? $_GET['url'] : substr(str_replace(str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']), '', $_SERVER['REQUEST_URI']), 1);

+        }

         $this->route->setUrl('/' . trim(explode('?', $url)[0], '/'));
     }
 
@@ -111,8 +114,9 @@ 
     {
         foreach ($this->config['matcher'] as $matcher) {
             $this->config['matcherInstance'][$matcher] = new $matcher($this);
-            if (call_user_func([$this->config['matcherInstance'][$matcher], 'match']))
-                return true;
+            if (call_user_func([$this->config['matcherInstance'][$matcher], 'match'])) {

+                            return true;

+            }

         }
         return false;
     }
@@ -157,12 +161,15 @@ 
     {
         if (isset($this->route->getDetail()['response_templates']) && isset($this->route->getDetail()['response_templates'][$code = $this->response->getStatusCode()])) {
             $this->route->setCallback($this->route->getDetail()['response_templates'][$code]);
-            if(!isset($this->config['matcherInstance']))
-                foreach ($this->config['matcher'] as $matcher)
-                    $this->config['matcherInstance'][$matcher] = new $matcher($this);
+            if(!isset($this->config['matcherInstance'])) {

+                            foreach ($this->config['matcher'] as $matcher)
+                    $this->config['matcherInstance'][$matcher] = new $matcher($this);

+            }

             foreach($this->config['matcherInstance'] as $instance) {
-                foreach (call_user_func([$instance, 'getMatcher']) as $match)
-                    if (call_user_func([$instance, $match])){ $this->callTarget(); break; }
+                foreach (call_user_func([$instance, 'getMatcher']) as $match) {

+                                    if (call_user_func([$instance, $match])){ $this->callTarget();

+                }

+                break; }
             }
             $this->response->setStatusCode($code);
         }