comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Dispatcher.php

Spacing +8 added lines, -8 removed lines

@@ -173,7 +173,7 @@ 
         $events->emit($this->createServiceSpecializedEvents('dispatcher.route'));
         $events->emit($this->createServiceSpecializedEvents('dispatcher.route.'.$route_type));
 
-        if ( $route_type == 'ROUTE' ) {
+        if ($route_type == 'ROUTE') {
             $logger->debug("Route leads to service $route_service");
             $events->emit($this->createServiceSpecializedEvents('dispatcher.route.'.$route_service));
         }
@@ -229,8 +229,8 @@ 
 
         $params = $route->getParameter('headers');
 
-        if ( !empty($params) && is_array($params) ) {
-            foreach($params as $name => $value) {
+        if (!empty($params) && is_array($params)) {
+            foreach ($params as $name => $value) {
                 $this->getResponse()->getHeaders()->set($name, $value);
             }
         }
@@ -246,11 +246,11 @@ 
         $code = $route->getRedirectCode();
 
         $location = $route->getRedirectLocation();
-        $uri = empty($location) ? (string) $this->getRequest()->getUri() : $location;
+        $uri = empty($location) ? (string)$this->getRequest()->getUri() : $location;
 
         $message = $route->getRedirectMessage();
 
-        if ( $route->getRedirectType() == Route::REDIRECT_REFRESH ) {
+        if ($route->getRedirectType() == Route::REDIRECT_REFRESH) {
 
             $output = empty($message) ?
                 "Please follow <a href=\"$location\">this link</a>"
@@ -262,10 +262,10 @@ 
 
         } else {
 
-            if ( !empty($code) ) {
+            if (!empty($code)) {
                 $status->set($code);
-            } else if ( $this->getRequest()->getVersion() == 'HTTP/1.1' ) {
-                $status->set( (string) $this->getRequest()->getMethod() !== 'GET' ? 303 : 307);
+            } else if ($this->getRequest()->getVersion() == 'HTTP/1.1') {
+                $status->set((string)$this->getRequest()->getMethod() !== 'GET' ? 303 : 307);
             } else {
                 $status->set(302);
             }

src/Comodojo/Dispatcher/Router/Model.php

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
 
     public function route(Request $request) {
 
-        $method = (string) $request->getMethod();
+        $method = (string)$request->getMethod();
 
         $methods = $this->configuration->get('allowed-http-methods');
 

src/Comodojo/Dispatcher/Router/Route.php

Indentation +2 added lines, -2 removed lines

@@ -80,8 +80,8 @@
     protected $error_message;
 
     /**
-    * @var array
-    */
+     * @var array
+     */
     protected $parameters = [];
 
     /**

Spacing +7 added lines, -7 removed lines

@@ -135,7 +135,7 @@ 
 
     public function setRedirectCode($code) {
 
-        if ( $code < 300 || $code >= 400 ) {
+        if ($code < 300 || $code >= 400) {
             throw new InvalidArgumentException("Invalid redirection code $code");
         }
 
@@ -181,7 +181,7 @@ 
 
     public function setRedirectType($type) {
 
-        if ( !in_array($type, [self::REDIRECT_REFRESH, self::REDIRECT_LOCATION]) ) {
+        if (!in_array($type, [self::REDIRECT_REFRESH, self::REDIRECT_LOCATION])) {
             throw new InvalidArgumentException("Invalid redirection type $type");
         }
 
@@ -199,7 +199,7 @@ 
 
     public function setErrorCode($code) {
 
-        if ( $code < 400 || $code >= 600 ) {
+        if ($code < 400 || $code >= 600) {
             throw new InvalidArgumentException("Invalid error code $code");
         }
 
@@ -359,13 +359,13 @@ 
         // Because of the nature of the global regular expression, all the bits of the matched route are associated with a parameter key
         foreach ($this->query as $key => $value) {
 
-            if ( isset($path[$key]) ) {
+            if (isset($path[$key])) {
                 /* if it's available a bit associated with the parameter name, it is compared against
                  * it's regular expression in order to extrect backreferences
                  */
-                if ( preg_match('/^' . $value['regex'] . '$/', $path[$key], $matches) ) {
+                if (preg_match('/^'.$value['regex'].'$/', $path[$key], $matches)) {
 
-                    if ( count($matches) == 1 ) $matches = $matches[0]; // This is the case where no backreferences are present or available.
+                    if (count($matches) == 1) $matches = $matches[0]; // This is the case where no backreferences are present or available.
 
                     // The extracted value (with any backreference available) is added to the query parameters.
                     $this->setRequestParameter($key, $matches);
@@ -391,7 +391,7 @@ 
      */
     public function serialize() {
 
-        return serialize( (object) [
+        return serialize((object)[
             'classname' => $this->classname,
             'type' => $this->type,
             'service' => $this->service,

src/Comodojo/Dispatcher/Router/Table.php

Spacing +10 added lines, -10 removed lines

@@ -41,7 +41,7 @@ 
      * Types of route that this table will accept
      * @var array
      */
-    const ALLOWED_ROUTES = [ "ROUTE", "REDIRECT", "ERROR" ];
+    const ALLOWED_ROUTES = ["ROUTE", "REDIRECT", "ERROR"];
 
     /**
      * Current repository of routes
@@ -90,11 +90,11 @@ 
 
         $type = strtoupper($type);
 
-        if ( !in_array($type, self::ALLOWED_ROUTES) ) {
+        if (!in_array($type, self::ALLOWED_ROUTES)) {
 
             $this->getLogger()->error("Invalid route definition - unknown type $type for route $route)");
 
-        } else if ( $type == 'ROUTE' && empty($class) ) {
+        } else if ($type == 'ROUTE' && empty($class)) {
 
             $this->getLogger()->error("Invalid route definition - missing class for route $route)");
 
@@ -102,7 +102,7 @@ 
 
             $routeData = $this->get($route);
 
-            if ( !is_null($routeData) ) {
+            if (!is_null($routeData)) {
 
                 $this->updateRoute($routeData, $type, $class, $parameters);
 
@@ -237,13 +237,13 @@ 
             ->setClassName($class)
             ->setParameters($parameters);
 
-        if ( !empty($parameters['redirect-code']) ) $route->setRedirectCode($parameters['redirect-code']);
-        if ( !empty($parameters['redirect-location']) ) $route->setRedirectLocation($parameters['redirect-location']);
-        if ( !empty($parameters['redirect-message']) ) $route->setRedirectLocation($parameters['redirect-message']);
-        if ( !empty($parameters['redirect-type']) ) $route->setRedirectType($parameters['redirect-type']);
+        if (!empty($parameters['redirect-code'])) $route->setRedirectCode($parameters['redirect-code']);
+        if (!empty($parameters['redirect-location'])) $route->setRedirectLocation($parameters['redirect-location']);
+        if (!empty($parameters['redirect-message'])) $route->setRedirectLocation($parameters['redirect-message']);
+        if (!empty($parameters['redirect-type'])) $route->setRedirectType($parameters['redirect-type']);
 
-        if ( !empty($parameters['error-code']) ) $route->setErrorCode($parameters['error-code']);
-        if ( !empty($parameters['error-message']) ) $route->setErrorMessage($parameters['error-message']);
+        if (!empty($parameters['error-code'])) $route->setErrorCode($parameters['error-code']);
+        if (!empty($parameters['error-message'])) $route->setErrorMessage($parameters['error-message']);
 
     }
 

Braces +24 added lines, -8 removed lines

@@ -237,19 +237,33 @@ 
             ->setClassName($class)
             ->setParameters($parameters);
 
-        if ( !empty($parameters['redirect-code']) ) $route->setRedirectCode($parameters['redirect-code']);
-        if ( !empty($parameters['redirect-location']) ) $route->setRedirectLocation($parameters['redirect-location']);
-        if ( !empty($parameters['redirect-message']) ) $route->setRedirectLocation($parameters['redirect-message']);
-        if ( !empty($parameters['redirect-type']) ) $route->setRedirectType($parameters['redirect-type']);
+        if ( !empty($parameters['redirect-code']) ) {
+            $route->setRedirectCode($parameters['redirect-code']);
+        }
+        if ( !empty($parameters['redirect-location']) ) {
+            $route->setRedirectLocation($parameters['redirect-location']);
+        }
+        if ( !empty($parameters['redirect-message']) ) {
+            $route->setRedirectLocation($parameters['redirect-message']);
+        }
+        if ( !empty($parameters['redirect-type']) ) {
+            $route->setRedirectType($parameters['redirect-type']);
+        }
 
-        if ( !empty($parameters['error-code']) ) $route->setErrorCode($parameters['error-code']);
-        if ( !empty($parameters['error-message']) ) $route->setErrorMessage($parameters['error-message']);
+        if ( !empty($parameters['error-code']) ) {
+            $route->setErrorCode($parameters['error-code']);
+        }
+        if ( !empty($parameters['error-message']) ) {
+            $route->setErrorMessage($parameters['error-message']);
+        }
 
     }
 
     private function readCache() {
 
-        if ($this->configuration->get('routing-table-cache') !== true) return;
+        if ($this->configuration->get('routing-table-cache') !== true) {
+            return;
+        }
 
         $data = $this->cache->read();
 
@@ -269,7 +283,9 @@ 
 
     private function dumpCache() {
 
-        if ($this->configuration->get('routing-table-cache') !== true) return;
+        if ($this->configuration->get('routing-table-cache') !== true) {
+            return;
+        }
 
         $ttl = $this->configuration->get('routing-table-ttl');