jetfirephp / routing

src/Routing/Matcher/ArrayMatcher.php

Braces +45 added lines, -25 removed lines

@@ -105,7 +105,9 @@ 
                     $this->request['route'] = preg_replace_callback('#:([\w]+)#', [$this, 'paramMatch'], '/' . trim(trim($this->request['prefix'], '/') . '/' . trim($route, '/'), '/'));
                     if ($this->routeMatch('#^' . $this->request['route'] . '$#')) {
                         $this->setCallback();
-                        if (!is_null($response = $this->generateTarget())) return $response;
+                        if (!is_null($response = $this->generateTarget())) {

+                            return $response;

+                        }

                     }
                 }
             }
@@ -122,7 +124,9 @@ 
         $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http') . '://' . ($host = (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST']));
         $host = explode(':', $host)[0];
         $domain = $this->router->collection->getDomain($url);
-        if (!empty($this->request['subdomain']) && $route[0] == '/') $route = trim($this->request['subdomain'], '.') . '.' . $domain . $route;
+        if (!empty($this->request['subdomain']) && $route[0] == '/') {

+            $route = trim($this->request['subdomain'], '.') . '.' . $domain . $route;

+        }

         if ($route[0] == '/') {
             return ($host != $domain) ? false : true;
         } elseif ($route[0] != '/' && $host != $domain) {
@@ -170,8 +174,9 @@ 
     {
         if (substr($this->request['route'], -1) == '*') {
             $pos = strpos($this->request['route'], '*');
-            if (substr($this->router->route->getUrl(), 0, $pos) == substr($this->request['route'], 0, $pos) && isset($this->request['params']))
-                return true;
+            if (substr($this->router->route->getUrl(), 0, $pos) == substr($this->request['route'], 0, $pos) && isset($this->request['params'])) {

+                            return true;

+            }

         }
         if (preg_match($regex, $this->router->route->getUrl(), $this->request['parameters'])) {
             array_shift($this->request['parameters']);
@@ -189,8 +194,9 @@ 
             foreach ($this->resolver as $resolver) {
                 if (is_array($target = call_user_func_array([$this, $resolver], [$this->router->route->getCallback()]))) {
                     $this->setTarget($target);
-                    if ($this->router->middleware->globalMiddleware() === false || $this->router->middleware->blockMiddleware() === false || $this->router->middleware->classMiddleware() === false || $this->router->middleware->routeMiddleware() === false)
-                        return null;
+                    if ($this->router->middleware->globalMiddleware() === false || $this->router->middleware->blockMiddleware() === false || $this->router->middleware->classMiddleware() === false || $this->router->middleware->routeMiddleware() === false) {

+                                            return null;

+                    }

                     $this->router->response->setStatusCode(202);
                     return true;
                 }
@@ -233,14 +239,18 @@ 
     private function setCallback()
     {
         if (isset($this->request['params'])) {
-            if (is_callable($this->request['params']))
-                $this->router->route->setCallback($this->request['params']);
-            else {
+            if (is_callable($this->request['params'])) {

+                            $this->router->route->setCallback($this->request['params']);

+            } else {
                 (is_array($this->request['params']) && isset($this->request['params']['use']))
                     ? $this->router->route->setCallback($this->request['params']['use'])
                     : $this->router->route->setCallback($this->request['params']);
-                if (isset($this->request['params']['name'])) $this->router->route->setName($this->request['params']['name']);
-                if (isset($this->request['params']['method'])) $this->request['params']['method'] = is_array($this->request['params']['method']) ? $this->request['params']['method'] : [$this->request['params']['method']];
+                if (isset($this->request['params']['name'])) {

+                    $this->router->route->setName($this->request['params']['name']);

+                }

+                if (isset($this->request['params']['method'])) {

+                    $this->request['params']['method'] = is_array($this->request['params']['method']) ? $this->request['params']['method'] : [$this->request['params']['method']];

+                }

             }
         }
     }
@@ -250,9 +260,12 @@ 
      */
     public function validMethod()
     {
-        if (is_callable($this->request['params'])) return true;
-        if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')
-            return (isset($this->request['params']['ajax']) && $this->request['params']['ajax'] === true) ? true : false;
+        if (is_callable($this->request['params'])) {

+            return true;

+        }

+        if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {

+                    return (isset($this->request['params']['ajax']) && $this->request['params']['ajax'] === true) ? true : false;

+        }

         $method = (isset($this->request['params']['method'])) ? $this->request['params']['method'] : ['GET'];
         return (in_array($this->router->route->getMethod(), $method)) ? true : false;
     }
@@ -318,20 +331,25 @@ 
     {
         if (is_string($callback) && strpos($callback, '@') !== false) {
             $routes = explode('@', $callback);
-            if (!isset($routes[1])) $routes[1] = 'index';
+            if (!isset($routes[1])) {

+                $routes[1] = 'index';

+            }

             if ($routes[1] == '{method}') {
                 $this->request['parameters'] = explode('/', str_replace(str_replace('*', '', $this->request['route']), '', $this->router->route->getUrl()));
                 $routes[1] = $this->request['parameters'][0];
                 array_shift($this->request['parameters']);
-                if (preg_match('/[A-Z]/', $routes[1])) return false;
+                if (preg_match('/[A-Z]/', $routes[1])) {

+                    return false;

+                }

                 $routes[1] = lcfirst(str_replace(' ', '', ucwords(str_replace('-', ' ', $routes[1]))));
             }
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
             $class = (class_exists($routes[0]))
                 ? $routes[0]
                 : $this->router->collection->getRoutes()['ctrl_namespace_' . $index] . $routes[0];
-            if (!class_exists($class))
-                throw new \Exception('Class "' . $class . '." is not found');
+            if (!class_exists($class)) {

+                            throw new \Exception('Class "' . $class . '." is not found');

+            }

             if (method_exists($class, $routes[1])) {
                 return [
                     'dispatcher' => $this->dispatcher['isController'],
@@ -340,8 +358,9 @@ 
                     'action' => $routes[1]
                 ];
             }
-            if (!strpos($callback, '{method}') !== false)
-                throw new \Exception('The required method "' . $routes[1] . '" is not found in "' . $class . '"');
+            if (!strpos($callback, '{method}') !== false) {

+                            throw new \Exception('The required method "' . $routes[1] . '" is not found in "' . $class . '"');

+            }

         }
         return false;
     }
@@ -359,9 +378,9 @@ 
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
             $viewDir = $this->router->collection->getRoutes('view_dir_' . $index);
             $target = null;
-            if (in_array('.' . $extension, $this->router->getConfig()['templateExtension']) && (is_file($fullPath = $viewDir . $path) || is_file($fullPath = $path)))
-                $target = $fullPath;
-            else {
+            if (in_array('.' . $extension, $this->router->getConfig()['templateExtension']) && (is_file($fullPath = $viewDir . $path) || is_file($fullPath = $path))) {

+                            $target = $fullPath;

+            } else {
                 foreach ($this->router->getConfig()['templateExtension'] as $ext) {
                     if (is_file($fullPath = $viewDir . $path . $ext) || is_file($fullPath = $path . $ext)) {
                         $target = $fullPath;
@@ -370,8 +389,9 @@ 
                     }
                 }
             }
-            if (is_null($target))
-                throw new \Exception('Template file "' . $path . '" is not found in "' . $viewDir . '"');
+            if (is_null($target)) {

+                            throw new \Exception('Template file "' . $path . '" is not found in "' . $viewDir . '"');

+            }

             return [
                 'dispatcher' => $this->dispatcher['isTemplate'],
                 'template' => $target,

src/Routing/Router.php

Braces +39 added lines, -24 removed lines

@@ -85,8 +85,9 @@ 
      */
     public function setMatcher($matcher)
     {
-        if (is_object($matcher))
-            $matcher = [$matcher];
+        if (is_object($matcher)) {

+                    $matcher = [$matcher];

+        }

         $this->matcher = $matcher;
     }
 
@@ -104,8 +105,12 @@ 
     public function run()
     {
         $this->setUrl();
-        if ($this->config['generateRoutesPath']) $this->collection->generateRoutesPath();
-        if ($this->match()) $this->callTarget();
+        if ($this->config['generateRoutesPath']) {

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

+        }

+        if ($this->match()) {

+            $this->callTarget();

+        }

         $this->callResponse();
     }
 
@@ -114,8 +119,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], '/'));
     }
 
@@ -125,7 +131,9 @@ 
     public function match()
     {
         foreach ($this->matcher as $key => $matcher) {
-            if (call_user_func([$this->matcher[$key], 'match'])) return true;
+            if (call_user_func([$this->matcher[$key], 'match'])) {

+                return true;

+            }

         }
         return false;
     }
@@ -160,11 +168,16 @@ 
         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]);
             $matcher = null;
-            foreach ($this->matcher as $instance) if ($instance instanceof ArrayMatcher) $matcher = $instance;
-            if (is_null($matcher)) $matcher = new ArrayMatcher($this);
-            foreach (call_user_func([$matcher, 'getResolver']) as $match)
-                if (is_array($target = call_user_func_array([$matcher, $match], [$this->route->getCallback()]))) {
-                    call_user_func_array([$matcher, 'setTarget'], [$target]);
+            foreach ($this->matcher as $instance) {

+                if ($instance instanceof ArrayMatcher) $matcher = $instance;

+            }

+            if (is_null($matcher)) {

+                $matcher = new ArrayMatcher($this);

+            }

+            foreach (call_user_func([$matcher, 'getResolver']) as $match) {

+                            if (is_array($target = call_user_func_array([$matcher, $match], [$this->route->getCallback()]))) {
+                    call_user_func_array([$matcher, 'setTarget'], [$target]);

+            }

                     $this->callTarget();
                     break;
                 }
@@ -198,9 +211,9 @@ 
             $reflectionMethod = new ReflectionMethod($controller, $method);
             $dependencies = [];
             foreach ($reflectionMethod->getParameters() as $arg) {
-                if (isset($methodArgs[$arg->name]))
-                    array_push($dependencies, $methodArgs[$arg->name]);
-                else if (!is_null($arg->getClass())) {
+                if (isset($methodArgs[$arg->name])) {

+                                    array_push($dependencies, $methodArgs[$arg->name]);

+                } else if (!is_null($arg->getClass())) {
                     array_push($dependencies, call_user_func_array($this->getConfig()['di'], [$arg->getClass()->name]));
                 }
             }
@@ -220,18 +233,20 @@ 
     public function callClass($controller, $ctrlArgs = [], $classInstance = [])
     {
         $reflector = new ReflectionClass($controller);
-        if (!$reflector->isInstantiable())
-            throw new \Exception('Controller [' . $controller . '] is not instantiable.');
+        if (!$reflector->isInstantiable()) {

+                    throw new \Exception('Controller [' . $controller . '] is not instantiable.');

+        }

         $constructor = $reflector->getConstructor();
-        if (is_null($constructor))
-            return call_user_func_array($this->getConfig()['di'], [$controller]);
+        if (is_null($constructor)) {

+                    return call_user_func_array($this->getConfig()['di'], [$controller]);

+        }

         $dependencies = [];
         foreach ($constructor->getParameters() as $arg) {
-            if (isset($ctrlArgs[$arg->name]))
-                array_push($dependencies, $ctrlArgs[$arg->name]);
-            else if (isset($classInstance[$arg->getClass()->name]))
-                array_push($dependencies, $classInstance[$arg->getClass()->name]);
-            else if (!is_null($arg->getClass())) {
+            if (isset($ctrlArgs[$arg->name])) {

+                            array_push($dependencies, $ctrlArgs[$arg->name]);

+            } else if (isset($classInstance[$arg->getClass()->name])) {

+                            array_push($dependencies, $classInstance[$arg->getClass()->name]);

+            } else if (!is_null($arg->getClass())) {
                 array_push($dependencies, call_user_func_array($this->getConfig()['di'], [$arg->getClass()->name]));
             }
         }

src/Routing/Dispatcher/ControllerDispatcher.php

Braces +12 added lines, -7 removed lines

@@ -51,17 +51,21 @@ 
 
         if ($count == count($this->route->getParameters()) || (empty($this->route->getParameters()) && $count == 0)) {
             $dependencies = array_merge($dependencies, ($this->route->getParameters() == '') ? [] : $this->route->getParameters());
-            if ($this->response->getStatusCode() == 202)
-                $this->response->setStatusCode(200);
+            if ($this->response->getStatusCode() == 202) {

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

+            }

             if (is_array($content = $reflectionMethod->invokeArgs($this->getController(), $dependencies))) {
                 $this->route->addTarget('data', $content);
                 if (isset($this->route->getParams()['ajax']) && $this->route->getParams()['ajax'] === true) {
                     $this->response->setContent(json_encode($content));
                     $this->response->setHeaders(['Content-Type' => 'application/json']);
                 }
-            } elseif (!is_null($content)) $this->response->setContent($content);
-        } else
-            $this->response->setStatusCode(404);
+            } elseif (!is_null($content)) {

+                $this->response->setContent($content);

+            }

+        } else {

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

+        }

     }
 
 
@@ -72,8 +76,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');