jetfirephp / routing

src/Routing/Matcher/ArrayMatcher.php

Spacing +22 added lines, -22 removed lines

@@ -25,7 +25,7 @@ 
     /**
      * @var array
      */
-    private $matcher = ['matchClosureTemplate','matchControllerTemplate','matchTemplate'];
+    private $matcher = ['matchClosureTemplate', 'matchControllerTemplate', 'matchTemplate'];
 
     /**
      * @var array
@@ -47,7 +47,7 @@ 
     /**
      * @param string $matcher
      */
-    public function addMatcher($matcher){
+    public function addMatcher($matcher) {
         $this->matcher[] = $matcher;
     }
 
@@ -62,7 +62,7 @@ 
     /**
      * @param array $dispatcher
      */
-    public function setDispatcher($dispatcher = []){
+    public function setDispatcher($dispatcher = []) {
         $this->dispatcher = $dispatcher;
     }
 
@@ -72,7 +72,7 @@ 
      * @return mixed|void
      * @internal param array $dispatcher
      */
-    public function addDispatcher($method,$class){
+    public function addDispatcher($method, $class) {
         $this->dispatcher[$method] = $class;
     }
 
@@ -133,9 +133,9 @@ 
      */
     private function generateTarget()
     {
-        if($this->validMethod())
-            foreach($this->matcher as $match)
-                if (is_array($target = call_user_func_array([$this,$match],[$this->router->route->getCallback()]))) {
+        if ($this->validMethod())
+            foreach ($this->matcher as $match)
+                if (is_array($target = call_user_func_array([$this, $match], [$this->router->route->getCallback()]))) {
                     $this->setTarget($target);
                     $this->router->response->setStatusCode(202);
                     return true;
@@ -147,20 +147,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']))
@@ -177,7 +177,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'];
@@ -189,10 +189,10 @@ 
      * @return array|bool
      * @throws \Exception
      */
-    public function matchClosureTemplate($callback){
-        if(is_array($cls = $this->matchClosure($callback))) {
+    public function matchClosureTemplate($callback) {
+        if (is_array($cls = $this->matchClosure($callback))) {
             if (is_array($this->request['params']) && isset($this->request['params']['template']) && is_array($tpl = $this->matchTemplate($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']]
                 ]);
             }
@@ -206,10 +206,10 @@ 
      * @return array|bool
      * @throws \Exception
      */
-    public function matchControllerTemplate($callback){
-        if(is_array($ctrl = $this->matchController($callback))) {
+    public function matchControllerTemplate($callback) {
+        if (is_array($ctrl = $this->matchController($callback))) {
             if (is_array($this->request['params']) && isset($this->request['params']['template']) && is_array($tpl = $this->matchTemplate($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']]
                 ]);
             }
@@ -247,7 +247,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])) {
@@ -270,7 +270,7 @@ 
      */
     public function matchTemplate($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;
@@ -287,7 +287,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'],

src/Routing/Matcher/UriMatcher.php

Spacing +18 added lines, -18 removed lines

@@ -45,7 +45,7 @@ 
     /**
      * @param string $matcher
      */
-    public function addMatcher($matcher){
+    public function addMatcher($matcher) {
         $this->matcher[] = $matcher;
     }
 
@@ -70,7 +70,7 @@ 
      * @param $class
      * @return mixed|void
      */
-    public function addDispatcher($method,$class){
+    public function addDispatcher($method, $class) {
         $this->dispatcher[$method] = $class;
     }
 
@@ -79,8 +79,8 @@ 
      */
     public function match()
     {
-        foreach($this->matcher as $matcher){
-            if(is_array($target = call_user_func([$this,$matcher]))) {
+        foreach ($this->matcher as $matcher) {
+            if (is_array($target = call_user_func([$this, $matcher]))) {
                 $this->setTarget($target);
                 $this->router->response->setStatusCode(202);
                 return true;
@@ -92,21 +92,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 matchControllerTemplate(){
-        if(is_array($ctrl = $this->matchController())) {
+    public function matchControllerTemplate() {
+        if (is_array($ctrl = $this->matchController())) {
             if (is_array($tpl = $this->matchTemplate())) {
-                return array_merge(array_merge($ctrl, $tpl),[
+                return array_merge(array_merge($ctrl, $tpl), [
                     'dispatcher' => [$this->dispatcher['matchController'], $this->dispatcher['matchTemplate']]
                 ]);
             }
@@ -122,9 +122,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 [
@@ -146,13 +146,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;
@@ -165,7 +165,7 @@ 
                 }
             }
             ++$i;
-        }while($i < $this->router->collection->countRoutes);
+        }while ($i < $this->router->collection->countRoutes);
         return false;
     }
 

src/Routing/Dispatcher/ControllerDispatcher.php

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
     /**
      * @param Route $route
      */
-    public function __construct(Route $route,ResponseInterface $response)
+    public function __construct(Route $route, ResponseInterface $response)
     {
         $this->route = $route;
         $this->response = $response;
@@ -44,12 +44,12 @@ 
         $dependencies = [];
         foreach ($reflectionMethod->getParameters() as $arg)
             if (!is_null($arg->getClass()))
-                $dependencies[] = call_user_func_array($this->route->getTarget('di'),[$arg->getClass()->name]);
-        $dependencies = array_merge($dependencies,($this->route->getParameters() == '') ? [] : $this->route->getParameters());
+                $dependencies[] = call_user_func_array($this->route->getTarget('di'), [$arg->getClass()->name]);
+        $dependencies = array_merge($dependencies, ($this->route->getParameters() == '') ? [] : $this->route->getParameters());
         if ($this->response->getStatusCode() == 202)
             $this->response->setStatusCode(200);
-        if(is_array($content = $reflectionMethod->invokeArgs($this->getController(), $dependencies))) $this->route->addTarget('data',$content);
-        elseif(!is_null($content))$this->response->setContent($content);
+        if (is_array($content = $reflectionMethod->invokeArgs($this->getController(), $dependencies))) $this->route->addTarget('data', $content);
+        elseif (!is_null($content))$this->response->setContent($content);
     }
 
 
@@ -65,13 +65,13 @@ 
         $constructor = $reflector->getConstructor();
         if (is_null($constructor)) {
             $class = $this->route->getTarget('controller');
-            return call_user_func_array($this->route->getTarget('di'),[$class]);
+            return call_user_func_array($this->route->getTarget('di'), [$class]);
         }
         $dependencies = $constructor->getParameters();
         $arguments = [];
         foreach ($dependencies as $dep) {
             $class = $dep->getClass()->name;
-            array_push($arguments, call_user_func_array($this->route->getTarget('di'),[$class]));
+            array_push($arguments, call_user_func_array($this->route->getTarget('di'), [$class]));
         }
         return $reflector->newInstanceArgs($arguments);
     }

src/Routing/Dispatcher/ClosureDispatcher.php

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
     /**
      * @param Route $route
      */
-    public function __construct(Route $route,ResponseInterface $response)
+    public function __construct(Route $route, ResponseInterface $response)
     {
         $this->route = $route;
         $this->response = $response;
@@ -42,8 +42,8 @@ 
             $this->response->setHeaders(['Content-Type' => 'text/html']);
         }
         $params = ($this->route->getParameters() == '') ? [] : $this->route->getParameters();
-        if(is_array($content = call_user_func_array($this->route->getTarget('closure'), $params))) $this->route->addTarget('data',$content);
-        elseif(!is_null($content)) $this->response->setContent($content);
+        if (is_array($content = call_user_func_array($this->route->getTarget('closure'), $params))) $this->route->addTarget('data', $content);
+        elseif (!is_null($content)) $this->response->setContent($content);
     }
 
 }

src/Routing/Dispatcher/TemplateDispatcher.php

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
     /**
      * @param Route $route
      */
-    public function __construct(Route $route,ResponseInterface $response)
+    public function __construct(Route $route, ResponseInterface $response)
     {
         $this->route = $route;
         $this->response = $response;
@@ -53,7 +53,7 @@ 
             $this->response->setContent(call_user_func_array($this->route->getTarget('callback')[$this->route->getTarget('extension')], [$this->route]));
         else {
             ob_start();
-            if(isset($this->route->getTarget()['data']))extract($this->route->getTarget('data'));
+            if (isset($this->route->getTarget()['data']))extract($this->route->getTarget('data'));
             require($this->route->getTarget('template'));
             $this->response->setContent(ob_get_clean());
         }
@@ -62,7 +62,7 @@ 
     /**
      * @param $extension
      */
-    public function setContentType($extension){
+    public function setContentType($extension) {
         $this->response->setStatusCode(200);
         isset($this->types[$extension])
             ? $this->response->setHeaders(['Content-Type' => $this->types[$extension]])

src/Routing/Router.php

Spacing +12 added lines, -12 removed lines

@@ -46,13 +46,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;
         };
     }
@@ -76,7 +76,7 @@ 
     /**
      * @param string $matcher
      */
-    public function addMatcher($matcher){
+    public function addMatcher($matcher) {
         $this->config['matcher'][] = $matcher;
     }
 
@@ -122,9 +122,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']);
             }
@@ -158,13 +158,13 @@ 
     {
         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]);
-            if(!isset($this->config['matcherInstance']))
+            if (!isset($this->config['matcherInstance']))
                 foreach ($this->config['matcher'] as $matcher)
                     $this->config['matcherInstance'][$matcher] = new $matcher($this);
-            foreach($this->config['matcherInstance'] as $instance) {
+            foreach ($this->config['matcherInstance'] as $instance) {
                 foreach (call_user_func([$instance, 'getMatcher']) 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;
                     }