jetfirephp / routing

src/Routing/Matcher/ArrayMatcher.php

Spacing +15 added lines, -15 removed lines

@@ -24,7 +24,7 @@ 
     /**
      * @var array
      */
-    private $matcher = ['matchClosure','matchController','matchTemplate'];
+    private $matcher = ['matchClosure', 'matchController', 'matchTemplate'];
 
     /**
      * @var array
@@ -46,7 +46,7 @@ 
     /**
      * @param string $matcher
      */
-    public function addMatcher($matcher){
+    public function addMatcher($matcher) {
         $this->matcher[] = $matcher;
     }
 
@@ -61,7 +61,7 @@ 
     /**
      * @param array $dispatcher
      */
-    public function setDispatcher($dispatcher = []){
+    public function setDispatcher($dispatcher = []) {
         $this->dispatcher = $dispatcher;
     }
 
@@ -71,7 +71,7 @@ 
      * @return mixed|void
      * @internal param array $dispatcher
      */
-    public function addDispatcher($method,$class){
+    public function addDispatcher($method, $class) {
         $this->dispatcher[$method] = $class;
     }
 
@@ -133,13 +133,13 @@ 
      */
     private function generateTarget()
     {
-        if($this->validMethod()) {
-            foreach($this->matcher as $match) if(call_user_func([$this,$match])) break;
+        if ($this->validMethod()) {
+            foreach ($this->matcher as $match) if (call_user_func([$this, $match])) break;
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
-            $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));
             $this->router->response->setStatusCode(202);
-        }else
+        } else
             $this->router->response->setStatusCode(405);
         return $this->router->route->hasTarget();
     }
@@ -147,9 +147,9 @@ 
     /**
      *
      */
-    private function setRoute(){
+    private function setRoute() {
         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']))
@@ -167,7 +167,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->router->route->getDetail()['params']['method'])) ? $this->router->route->getDetail()['params']['method'] : ['GET'];
@@ -202,7 +202,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])) {
@@ -225,7 +225,7 @@ 
      */
     public function matchTemplate()
     {
-        if(is_string($this->router->route->getCallback())) {
+        if (is_string($this->router->route->getCallback())) {
             $path = trim($this->router->route->getCallback(), '/');
             $extension = substr(strrchr($path, "."), 1);
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
@@ -242,7 +242,7 @@ 
                     }
                 }
             }
-            if(is_null($target))
+            if (is_null($target))
                 throw new \Exception('Template file "' . $path . '" is not found in "' . $viewDir . '"');
             $this->router->route->setTarget([
                 'dispatcher' => $this->dispatcher['matchTemplate'],

src/Routing/Matcher/UriMatcher.php

Spacing +16 added lines, -16 removed lines

@@ -20,7 +20,7 @@ 
     /**
      * @var array
      */
-    private $matcher = ['matchController','matchTemplate'];
+    private $matcher = ['matchController', 'matchTemplate'];
 
     /**
      * @var array
@@ -41,7 +41,7 @@ 
     /**
      * @param string $matcher
      */
-    public function addMatcher($matcher){
+    public function addMatcher($matcher) {
         $this->matcher[] = $matcher;
     }
 
@@ -66,7 +66,7 @@ 
      * @param $class
      * @return mixed|void
      */
-    public function addDispatcher($method,$class){
+    public function addDispatcher($method, $class) {
         $this->dispatcher[$method] = $class;
     }
 
@@ -75,8 +75,8 @@ 
      */
     public function match()
     {
-        foreach($this->matcher as $matcher){
-            if(call_user_func([$this,$matcher])) {
+        foreach ($this->matcher as $matcher) {
+            if (call_user_func([$this, $matcher])) {
                 $this->router->response->setStatusCode(202);
                 return true;
             }
@@ -91,12 +91,12 @@ 
     {
         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))) {
-                    $block = $this->router->collection->getRoutes('block_'.$i);
-                    $viewDir = $this->router->collection->getRoutes('view_dir_'.$i);
+                    $block = $this->router->collection->getRoutes('block_' . $i);
+                    $viewDir = $this->router->collection->getRoutes('view_dir_' . $i);
                     $this->router->route->setTarget([
                         'dispatcher' => $this->dispatcher['matchTemplate'],
                         'block' => $block,
@@ -119,15 +119,15 @@ 
     {
         $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';
                 if (isset($route[1]) && method_exists($class, $route[1])) {
-                    $block = $this->router->collection->getRoutes('block_'.$i);
-                    $viewDir = $this->router->collection->getRoutes('view_dir_'.$i);
+                    $block = $this->router->collection->getRoutes('block_' . $i);
+                    $viewDir = $this->router->collection->getRoutes('view_dir_' . $i);
                     $this->router->route->setTarget([
                         'dispatcher' => $this->dispatcher['matchController'],
                         'block' => $block,
@@ -141,7 +141,7 @@ 
                 }
             }
             ++$i;
-        }while($i < $this->router->collection->countRoutes);
+        }while ($i < $this->router->collection->countRoutes);
         return false;
     }
 

src/Routing/Matcher/MatcherInterface.php

Spacing +1 added lines, -1 removed lines

@@ -41,5 +41,5 @@
      * @param $class
      * @return mixed
      */
-    public function addDispatcher($method,$class);
+    public function addDispatcher($method, $class);
 }