jetfirephp / routing

src/Routing/Matcher/ArrayMatcher.php

Spacing +23 added lines, -23 removed lines

@@ -25,7 +25,7 @@ 
     /**
      * @var array
      */
-    private $resolver = ['isClosureAndTemplate','isControllerAndTemplate','isTemplate'];
+    private $resolver = ['isClosureAndTemplate', 'isControllerAndTemplate', 'isTemplate'];
 
     /**
      * @var array
@@ -47,14 +47,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;
     }
 
@@ -69,7 +69,7 @@ 
     /**
      * @param array $dispatcher
      */
-    public function setDispatcher($dispatcher = []){
+    public function setDispatcher($dispatcher = []) {
         $this->dispatcher = $dispatcher;
     }
 
@@ -79,7 +79,7 @@ 
      * @return mixed|void
      * @internal param array $dispatcher
      */
-    public function addDispatcher($method,$class){
+    public function addDispatcher($method, $class) {
         $this->dispatcher[$method] = $class;
     }
 
@@ -140,9 +140,9 @@ 
      */
     private function generateTarget()
     {
-        if($this->validMethod())
-            foreach($this->resolver as $resolver)
-                if (is_array($target = call_user_func_array([$this,$resolver],[$this->router->route->getCallback()]))) {
+        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);
                     $this->router->response->setStatusCode(202);
                     return true;
@@ -154,20 +154,20 @@ 
     /**
      * @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);
-        $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('block', $this->router->collection->getRoutes('block_' . $index));
+        $this->router->route->addTarget('view_dir', $this->router->collection->getRoutes('view_dir_' . $index));
     }
 
     /**
      *
      */
-    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']))
@@ -184,7 +184,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'];
@@ -196,10 +196,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['matchClosure'], $this->dispatcher['matchTemplate']]
                 ]);
             }
@@ -213,10 +213,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['matchController'], $this->dispatcher['matchTemplate']]
                 ]);
             }
@@ -254,7 +254,7 @@ 
             $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');
             if (method_exists($class, $routes[1])) {
@@ -277,7 +277,7 @@ 
      */
     public function isTemplate($callback)
     {
-        if(is_string($callback)) {
+        if (is_string($callback)) {
             $path = trim($callback, '/');
             $extension = substr(strrchr($path, "."), 1);
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
@@ -294,7 +294,7 @@ 
                     }
                 }
             }
-            if(is_null($target))
+            if (is_null($target))
                 throw new \Exception('Template file "' . $path . '" is not found in "' . $viewDir . '"');
             return [
                 'dispatcher' => $this->dispatcher['matchTemplate'],

Braces +34 added lines, -21 removed lines

@@ -125,8 +125,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']);
@@ -140,10 +141,11 @@ 
      */
     private function generateTarget()
     {
-        if($this->validMethod())
-            foreach($this->resolver as $resolver)
+        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);
+                    $this->setTarget($target);

+        }

                     $this->router->response->setStatusCode(202);
                     return true;
                 }
@@ -167,14 +169,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']];

+                }

             }
         }
     }
@@ -184,9 +190,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;
     }
@@ -250,13 +259,16 @@ 
     {
         if (is_string($callback) && strpos($callback, '@') !== false) {
             $routes = explode('@', $callback);
-            if (!isset($routes[1])) $routes[1] = 'index';
+            if (!isset($routes[1])) {

+                $routes[1] = 'index';

+            }

             $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['matchController'],
@@ -283,9 +295,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;
@@ -294,8 +306,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['matchTemplate'],
                 'template'   => $target,

src/Routing/Matcher/UriMatcher.php

Spacing +19 added lines, -19 removed lines

@@ -45,14 +45,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;
     }
 
@@ -77,7 +77,7 @@ 
      * @param $class
      * @return mixed|void
      */
-    public function addDispatcher($method,$class){
+    public function addDispatcher($method, $class) {
         $this->dispatcher[$method] = $class;
     }
 
@@ -86,8 +86,8 @@ 
      */
     public function match()
     {
-        foreach($this->resolver as $resolver){
-            if(is_array($target = call_user_func([$this,$resolver]))) {
+        foreach ($this->resolver as $resolver) {
+            if (is_array($target = call_user_func([$this, $resolver]))) {
                 $this->setTarget($target);
                 $this->router->response->setStatusCode(202);
                 return true;
@@ -99,21 +99,21 @@ 
     /**
      * @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);
-        $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('block', $this->router->collection->getRoutes('block_' . $index));
+        $this->router->route->addTarget('view_dir', $this->router->collection->getRoutes('view_dir_' . $index));
     }
 
     /**
      * @return array|bool
      */
-    public function isControllerAndTemplate(){
-        if(is_array($ctrl = $this->isController())) {
+    public function isControllerAndTemplate() {
+        if (is_array($ctrl = $this->isController())) {
             if (is_array($tpl = $this->isTemplate())) {
-                return array_merge(array_merge($ctrl, $tpl),[
+                return array_merge(array_merge($ctrl, $tpl), [
                     'dispatcher' => [$this->dispatcher['matchController'], $this->dispatcher['matchTemplate']]
                 ]);
             }
@@ -129,9 +129,9 @@ 
     {
         foreach ($this->router->getConfig()['templateExtension'] as $extension) {
             for ($i = 0; $i < $this->router->collection->countRoutes; ++$i) {
-                $url = explode('/', str_replace($this->router->collection->getRoutes('prefix_' . $i), '',$this->router->route->getUrl()));
+                $url = explode('/', str_replace($this->router->collection->getRoutes('prefix_' . $i), '', $this->router->route->getUrl()));
                 $end = array_pop($url);
-                $url = implode('/', array_map('ucwords', $url)).'/'.$end;
+                $url = implode('/', array_map('ucwords', $url)) . '/' . $end;
                 if (is_file(($template = rtrim($this->router->collection->getRoutes('view_dir_' . $i), '/') . $url . $extension))) {
                     $this->request['collection_index'] = $i;
                     return [
@@ -153,13 +153,13 @@ 
     {
         $routes = array_slice(explode('/', $this->router->route->getUrl()), 1);
         $i = 0;
-        do{
-            $route =  ('/' . $routes[0] == $this->router->collection->getRoutes('prefix_' . $i)) ? array_slice($routes, 1) : $routes;
+        do {
+            $route = ('/' . $routes[0] == $this->router->collection->getRoutes('prefix_' . $i)) ? array_slice($routes, 1) : $routes;
             if (isset($route[0])) {
-                $class =  (class_exists($this->router->collection->getRoutes('ctrl_namespace_' . $i). ucfirst($route[0]) . 'Controller'))
-                    ? $this->router->collection->getRoutes('ctrl_namespace_' . $i). ucfirst($route[0]) . 'Controller'
+                $class = (class_exists($this->router->collection->getRoutes('ctrl_namespace_' . $i) . ucfirst($route[0]) . 'Controller'))
+                    ? $this->router->collection->getRoutes('ctrl_namespace_' . $i) . ucfirst($route[0]) . 'Controller'
                     : ucfirst($route[0]) . 'Controller';
-                $route[1] = isset($route[1])?$route[1]:'index';
+                $route[1] = isset($route[1]) ? $route[1] : 'index';
                 if (method_exists($class, $route[1])) {
                     $this->request['parameters'] = array_slice($route, 2);
                     $this->request['collection_index'] = $i;
@@ -172,7 +172,7 @@ 
                 }
             }
             ++$i;
-        }while($i < $this->router->collection->countRoutes);
+        }while ($i < $this->router->collection->countRoutes);
         return false;
     }
 

src/Routing/Router.php

Spacing +13 added lines, -13 removed lines

@@ -48,13 +48,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;
         };
     }
@@ -78,8 +78,8 @@ 
     /**
      * @param object|array $matcher
      */
-    public function setMatcher($matcher){
-        if(is_object($matcher))
+    public function setMatcher($matcher) {
+        if (is_object($matcher))
             $matcher = [$matcher];
         $this->matcher = $matcher;
     }
@@ -87,7 +87,7 @@ 
     /**
      * @param string $matcher
      */
-    public function addMatcher($matcher){
+    public function addMatcher($matcher) {
         $this->matcher[] = $matcher;
     }
 
@@ -132,9 +132,9 @@ 
      */
     public function callTarget()
     {
-        $target = is_array($this->route->getTarget('dispatcher'))?$this->route->getTarget('dispatcher'):[$this->route->getTarget('dispatcher')];
-        if(!empty($target)) {
-            foreach($target as $call) {
+        $target = is_array($this->route->getTarget('dispatcher')) ? $this->route->getTarget('dispatcher') : [$this->route->getTarget('dispatcher')];
+        if (!empty($target)) {
+            foreach ($target as $call) {
                 $this->dispatcher = new $call($this->route, $this->response);
                 call_user_func([$this->dispatcher, 'call']);
             }
@@ -168,10 +168,10 @@ 
     {
         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]);
-            foreach($this->matcher as $key => $instance) {
+            foreach ($this->matcher as $key => $instance) {
                 foreach (call_user_func([$instance, 'getResolver']) as $match)
-                    if (is_array($target = call_user_func_array([$instance, $match], [$this->route->getCallback()]))){
-                        call_user_func_array([$instance, 'setTarget'],[$target]);
+                    if (is_array($target = call_user_func_array([$instance, $match], [$this->route->getCallback()]))) {
+                        call_user_func_array([$instance, 'setTarget'], [$target]);
                         $this->callTarget();
                         break;
                     }

Braces +16 added lines, -10 removed lines

@@ -79,8 +79,9 @@ 
      * @param object|array $matcher
      */
     public function setMatcher($matcher){
-        if(is_object($matcher))
-            $matcher = [$matcher];
+        if(is_object($matcher)) {

+                    $matcher = [$matcher];

+        }

         $this->matcher = $matcher;
     }
 
@@ -97,7 +98,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();
@@ -110,8 +113,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], '/'));
     }
 
@@ -121,8 +125,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;
     }
@@ -169,9 +174,10 @@ 
         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]);
             foreach($this->matcher as $key => $instance) {
-                foreach (call_user_func([$instance, 'getResolver']) as $match)
-                    if (is_array($target = call_user_func_array([$instance, $match], [$this->route->getCallback()]))){
-                        call_user_func_array([$instance, 'setTarget'],[$target]);
+                foreach (call_user_func([$instance, 'getResolver']) as $match) {

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

+                }

                         $this->callTarget();
                         break;
                     }