jetfirephp / routing

src/Routing/Matcher/ArrayMatcher.php

Spacing +25 added lines, -25 removed lines

@@ -98,15 +98,15 @@ 
     {
         $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)) {
                     $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();
                         return $this->generateTarget();
                     }
@@ -122,19 +122,19 @@ 
      */
     private function checkSubdomain($route)
     {
-        $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http') . '://' . ($host = (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST']));
+        $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) {
             $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;
             }
         }
@@ -147,7 +147,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 '([^/]+)';
     }
@@ -160,7 +160,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 '([^/]+)';
     }
@@ -171,7 +171,7 @@ 
      */
     private function routeMatch($regex)
     {
-        $regex = (substr($this->request['route'], -1) == '*') ? '#^' . $this->request['route'] . '#' : $regex;
+        $regex = (substr($this->request['route'], -1) == '*') ? '#^'.$this->request['route'].'#' : $regex;
         if (preg_match($regex, $this->router->route->getUrl(), $this->request['parameters'])) {
             array_shift($this->request['parameters']);
             return true;
@@ -206,9 +206,9 @@ 
         $this->checkRequest('prefix');
         $this->router->route->setDetail($this->request);
         $this->router->route->setTarget($target);
-        $this->router->route->addTarget('block', $this->router->collection->getRoutes('block_' . $index));
-        $this->router->route->addTarget('view_dir', $this->router->collection->getRoutes('view_dir_' . $index));
-        $this->router->route->addTarget('params', $this->router->collection->getRoutes('params_' . $index));
+        $this->router->route->addTarget('block', $this->router->collection->getRoutes('block_'.$index));
+        $this->router->route->addTarget('view_dir', $this->router->collection->getRoutes('view_dir_'.$index));
+        $this->router->route->addTarget('params', $this->router->collection->getRoutes('params_'.$index));
     }
 
     /**
@@ -219,8 +219,8 @@ 
         if (strpos($this->request[$key], ':') !== false && isset($this->request['parameters'][0])) {
             $replacements = $this->request['parameters'];
             $keys = [];
-            $this->request['@' . $key] = $this->request[$key];
-            $this->request[$key] = preg_replace_callback('#:([\w]+)#', function ($matches) use (&$replacements, &$keys) {
+            $this->request['@'.$key] = $this->request[$key];
+            $this->request[$key] = preg_replace_callback('#:([\w]+)#', function($matches) use (&$replacements, &$keys) {
                 $keys[$matches[0]] = $replacements[0];
                 return array_shift($replacements);
             }, $this->request[$key]);
@@ -335,7 +335,7 @@ 
             $routes = explode('@', $callback);
             if (!isset($routes[1])) $routes[1] = 'index';
             if ($routes[1] == '{method}') {
-                $params = explode('/', preg_replace('#' . str_replace('*', '', $this->request['route']) . '#', '', $this->router->route->getUrl()));
+                $params = explode('/', preg_replace('#'.str_replace('*', '', $this->request['route']).'#', '', $this->router->route->getUrl()));
                 $routes[1] = $params[0];
                 array_shift($params);
                 array_merge($this->request['parameters'], $params);
@@ -345,9 +345,9 @@ 
             $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 [
@@ -358,7 +358,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;
@@ -375,13 +375,13 @@ 
             $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;
@@ -389,7 +389,7 @@ 
                 }
             }
             if (is_null($target)) {
-                throw new \Exception('Template file "' . $path . '" is not found in "' . $viewDir . '"');
+                throw new \Exception('Template file "'.$path.'" is not found in "'.$viewDir.'"');
             }
             return [
                 'dispatcher' => $this->dispatcher['isTemplate'],