jetfirephp / routing

src/Routing/Matcher/ArrayMatcher.php

Spacing +47 added lines, -47 removed lines

@@ -25,7 +25,7 @@ 
     /**
      * @var array
      */
-    private $resolver = ['isClosureAndTemplate','isControllerAndTemplate','isTemplate'];
+    private $resolver = ['isClosureAndTemplate', 'isControllerAndTemplate', 'isTemplate'];
 
     /**
      * @var array
@@ -34,8 +34,8 @@ 
         'isClosure' => 'JetFire\Routing\Dispatcher\ClosureDispatcher',
         'isController' => 'JetFire\Routing\Dispatcher\ControllerDispatcher',
         'isTemplate' => 'JetFire\Routing\Dispatcher\TemplateDispatcher',
-        'isControllerAndTemplate' => ['JetFire\Routing\Dispatcher\ControllerDispatcher','JetFire\Routing\Dispatcher\TemplateDispatcher'],
-        'isClosureAndTemplate' => ['JetFire\Routing\Dispatcher\ClosureDispatcher','JetFire\Routing\Dispatcher\TemplateDispatcher'],
+        'isControllerAndTemplate' => ['JetFire\Routing\Dispatcher\ControllerDispatcher', 'JetFire\Routing\Dispatcher\TemplateDispatcher'],
+        'isClosureAndTemplate' => ['JetFire\Routing\Dispatcher\ClosureDispatcher', 'JetFire\Routing\Dispatcher\TemplateDispatcher'],
     ];
 
     /**
@@ -49,14 +49,14 @@ 
     /**
      * @param array $resolver
      */
-    public function setResolver($resolver = []){
+    public function setResolver($resolver = []) {
         $this->resolver = $resolver;
     }
 
     /**
      * @param string $resolver
      */
-    public function addResolver($resolver){
+    public function addResolver($resolver) {
         $this->resolver[] = $resolver;
     }
 
@@ -71,7 +71,7 @@ 
     /**
      * @param array $dispatcher
      */
-    public function setDispatcher($dispatcher = []){
+    public function setDispatcher($dispatcher = []) {
         $this->dispatcher = $dispatcher;
     }
 
@@ -81,7 +81,7 @@ 
      * @return mixed|void
      * @internal param array $dispatcher
      */
-    public function addDispatcher($method,$class){
+    public function addDispatcher($method, $class) {
         $this->dispatcher[$method] = $class;
     }
 
@@ -92,17 +92,17 @@ 
     {
         $this->request = [];
         for ($i = 0; $i < $this->router->collection->countRoutes; ++$i) {
-            $this->request['prefix'] = ($this->router->collection->getRoutes('prefix_' . $i) != '') ? $this->router->collection->getRoutes('prefix_' . $i) : '';
-            $this->request['subdomain'] = ($this->router->collection->getRoutes('subdomain_' . $i) != '') ? $this->router->collection->getRoutes('subdomain_' . $i) : '';
-            foreach ($this->router->collection->getRoutes('routes_' . $i) as $route => $params) {
+            $this->request['prefix'] = ($this->router->collection->getRoutes('prefix_'.$i) != '') ? $this->router->collection->getRoutes('prefix_'.$i) : '';
+            $this->request['subdomain'] = ($this->router->collection->getRoutes('subdomain_'.$i) != '') ? $this->router->collection->getRoutes('subdomain_'.$i) : '';
+            foreach ($this->router->collection->getRoutes('routes_'.$i) as $route => $params) {
                 $this->request['params'] = $params;
                 $this->request['collection_index'] = $i;
-                if($this->checkSubdomain($route)) {
+                if ($this->checkSubdomain($route)) {
                     $route = strstr($route, '/');
-                    $this->request['route'] = preg_replace_callback('#:([\w]+)#', [$this, 'paramMatch'], '/' . trim(trim($this->request['prefix'], '/') . '/' . trim($route, '/'), '/'));
-                    if ($this->routeMatch('#^' . $this->request['route'] . '$#')) {
+                    $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;
                     }
                 }
             }
@@ -114,19 +114,19 @@ 
      * @param $route
      * @return bool
      */
-    private function checkSubdomain($route){
-        $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http') . '://' . ($host = (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']));
+    private function checkSubdomain($route) {
+        $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http').'://'.($host = (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']));
         $domain = $this->router->collection->getDomain($url);
-        if(!empty($this->request['subdomain']) && $route[0] == '/') $route = trim($this->request['subdomain'],'.').'.'.$domain.$route;
-        if($route[0] == '/'){
+        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){
+        }elseif ($route[0] != '/' && $host != $domain) {
             $route = substr($route, 0, strpos($route, "/"));
             $route = str_replace('{host}', $domain, $route);
             $route = preg_replace_callback('#{subdomain}#', [$this, 'subdomainMatch'], $route);
-            if (preg_match('#^' . $route . '$#', $host, $this->request['called_subdomain'])) {
+            if (preg_match('#^'.$route.'$#', $host, $this->request['called_subdomain'])) {
                 $this->request['called_subdomain'] = array_shift($this->request['called_subdomain']);
-                $this->request['subdomain'] = str_replace('.'.$domain,'',$host);
+                $this->request['subdomain'] = str_replace('.'.$domain, '', $host);
                 return true;
             }
         }
@@ -139,7 +139,7 @@ 
     private function subdomainMatch()
     {
         if (is_array($this->request['params']) && isset($this->request['params']['subdomain'])) {
-            return '(' . $this->request['params']['subdomain'] . ')';
+            return '('.$this->request['params']['subdomain'].')';
         }
         return '([^/]+)';
     }
@@ -152,7 +152,7 @@ 
     {
         if (is_array($this->request['params']) && isset($this->request['params']['arguments'][$match[1]])) {
             $this->request['params']['arguments'][$match[1]] = str_replace('(', '(?:', $this->request['params']['arguments'][$match[1]]);
-            return '(' . $this->request['params']['arguments'][$match[1]] . ')';
+            return '('.$this->request['params']['arguments'][$match[1]].')';
         }
         return '([^/]+)';
     }
@@ -180,7 +180,7 @@ 
      */
     private function generateTarget()
     {
-        if($this->validMethod()) {
+        if ($this->validMethod()) {
             foreach ($this->resolver as $resolver) {
                 if (is_array($target = call_user_func_array([$this, $resolver], [$this->router->route->getCallback()]))) {
                     $this->setTarget($target);
@@ -199,7 +199,7 @@ 
     /**
      * @param array $target
      */
-    public function setTarget($target = []){
+    public function setTarget($target = []) {
         $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
         $this->router->route->setDetail($this->request);
         $this->router->route->setTarget($target);
@@ -210,9 +210,9 @@ 
     /**
      *
      */
-    private function setCallback(){
+    private function setCallback() {
         if (isset($this->request['params'])) {
-            if(is_callable($this->request['params']))
+            if (is_callable($this->request['params']))
                 $this->router->route->setCallback($this->request['params']);
             else {
                 (is_array($this->request['params']) && isset($this->request['params']['use']))
@@ -229,7 +229,7 @@ 
      */
     public function validMethod()
     {
-        if(is_callable($this->request['params']))return true;
+        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'];
@@ -241,10 +241,10 @@ 
      * @return array|bool
      * @throws \Exception
      */
-    public function isClosureAndTemplate($callback){
-        if(is_array($cls = $this->isClosure($callback))) {
+    public function isClosureAndTemplate($callback) {
+        if (is_array($cls = $this->isClosure($callback))) {
             if (is_array($this->request['params']) && isset($this->request['params']['template']) && is_array($tpl = $this->isTemplate($this->request['params']['template']))) {
-                return array_merge(array_merge($cls, $tpl),[
+                return array_merge(array_merge($cls, $tpl), [
                     'dispatcher' => $this->dispatcher['isClosureAndTemplate']
                 ]);
             }
@@ -258,10 +258,10 @@ 
      * @return array|bool
      * @throws \Exception
      */
-    public function isControllerAndTemplate($callback){
-        if(is_array($ctrl = $this->isController($callback))) {
+    public function isControllerAndTemplate($callback) {
+        if (is_array($ctrl = $this->isController($callback))) {
             if (is_array($this->request['params']) && isset($this->request['params']['template']) && is_array($tpl = $this->isTemplate($this->request['params']['template']))) {
-                return array_merge(array_merge($ctrl, $tpl),[
+                return array_merge(array_merge($ctrl, $tpl), [
                     'dispatcher' => $this->dispatcher['isControllerAndTemplate']
                 ]);
             }
@@ -296,19 +296,19 @@ 
         if (is_string($callback) && strpos($callback, '@') !== false) {
             $routes = explode('@', $callback);
             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()));
+            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;
-                $routes[1] = lcfirst(str_replace('-','',ucwords($routes[1],'-')));
+                if (preg_match('/[A-Z]/', $routes[1])) return false;
+                $routes[1] = lcfirst(str_replace('-', '', ucwords($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];
+                : $this->router->collection->getRoutes()['ctrl_namespace_'.$index].$routes[0];
             if (!class_exists($class))
-                throw new \Exception('Class "' . $class . '." is not found');
+                throw new \Exception('Class "'.$class.'." is not found');
             if (method_exists($class, $routes[1])) {
                 return [
                     'dispatcher' => $this->dispatcher['isController'],
@@ -318,7 +318,7 @@ 
                 ];
             }
             if (!strpos($callback, '{method}') !== false)
-                throw new \Exception('The required method "' . $routes[1] . '" is not found in "' . $class . '"');
+                throw new \Exception('The required method "'.$routes[1].'" is not found in "'.$class.'"');
         }
         return false;
     }
@@ -330,25 +330,25 @@ 
      */
     public function isTemplate($callback)
     {
-        if(is_string($callback) && strpos($callback, '@') === false) {
+        if (is_string($callback) && strpos($callback, '@') === false) {
             $path = trim($callback, '/');
             $extension = substr(strrchr($path, "."), 1);
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
-            $viewDir = $this->router->collection->getRoutes('view_dir_' . $index);
+            $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)))
+            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)) {
+                    if (is_file($fullPath = $viewDir.$path.$ext) || is_file($fullPath = $path.$ext)) {
                         $target = $fullPath;
                         $extension = substr(strrchr($ext, "."), 1);
                         break;
                     }
                 }
             }
-            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,

Braces +46 added lines, -26 removed lines

@@ -102,7 +102,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;

+                        }

                     }
                 }
             }
@@ -117,10 +119,12 @@ 
     private function checkSubdomain($route){
         $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http') . '://' . ($host = (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']));
         $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){
+        } elseif($route[0] != '/' && $host != $domain){
             $route = substr($route, 0, strpos($route, "/"));
             $route = str_replace('{host}', $domain, $route);
             $route = preg_replace_callback('#{subdomain}#', [$this, 'subdomainMatch'], $route);
@@ -165,8 +169,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']);
@@ -184,8 +189,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;
                 }
@@ -212,14 +218,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']];

+                }

             }
         }
     }
@@ -229,9 +239,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;
     }
@@ -295,20 +308,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($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'],
@@ -317,8 +335,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;
     }
@@ -336,9 +355,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;
@@ -347,8 +366,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,