jetfirephp / routing

src/Routing/Matcher/ArrayMatcher.php

Spacing +25 added lines, -25 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;
     }
 
@@ -142,9 +142,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;
@@ -156,20 +156,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']))
@@ -186,7 +186,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'];
@@ -198,10 +198,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']
                 ]);
             }
@@ -215,10 +215,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']
                 ]);
             }
@@ -256,7 +256,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])) {
@@ -279,7 +279,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;
@@ -296,7 +296,7 @@ 
                     }
                 }
             }
-            if(is_null($target))
+            if (is_null($target))
                 throw new \Exception('Template file "' . $path . '" is not found in "' . $viewDir . '"');
             return [
                 'dispatcher' => $this->dispatcher['isTemplate'],

src/Routing/Router.php

Spacing +14 added lines, -14 removed lines

@@ -49,13 +49,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;
         };
     }
@@ -79,8 +79,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;
     }
@@ -88,7 +88,7 @@ 
     /**
      * @param string $matcher
      */
-    public function addMatcher($matcher){
+    public function addMatcher($matcher) {
         $this->matcher[] = $matcher;
     }
 
@@ -133,9 +133,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']);
             }
@@ -170,11 +170,11 @@ 
         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]);
             $matcher = null;
-            foreach($this->matcher as $instance) if($instance instanceof ArrayMatcher) $matcher = $instance;
-            if(is_null($matcher))$matcher = new ArrayMatcher($this);
+            foreach ($this->matcher as $instance) if ($instance instanceof ArrayMatcher) $matcher = $instance;
+            if (is_null($matcher))$matcher = new ArrayMatcher($this);
             foreach (call_user_func([$matcher, 'getResolver']) as $match)
-                if (is_array($target = call_user_func_array([$matcher, $match], [$this->route->getCallback()]))){
-                    call_user_func_array([$matcher, 'setTarget'],[$target]);
+                if (is_array($target = call_user_func_array([$matcher, $match], [$this->route->getCallback()]))) {
+                    call_user_func_array([$matcher, 'setTarget'], [$target]);
                     $this->callTarget();
                     break;
                 }