comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Response/Preprocessor/Status301.php

Braces +3 added lines, -1 removed lines

@@ -32,7 +32,9 @@
 
         $location = $this->response->getLocation()->get();
 
-        if (empty($location)) throw new Exception("Invalid location, cannot redirect");
+        if (empty($location)) {
+            throw new Exception("Invalid location, cannot redirect");
+        }
 
         $this->response->getHeaders()->set("Location", $location);
 

src/Comodojo/Dispatcher/Response/Preprocessor/Status405.php

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
         // An Allow Header should be provided from DispatcherException
         $allow = $this->response->getHeaders()->get('Allow');
 
-        if (is_null($allow)) throw new Exception("Missing Allow header");
+        if (is_null($allow)) {
+            throw new Exception("Missing Allow header");
+        }
 
         parent::consolidate();
 

src/Comodojo/Dispatcher/Response/Model.php

Braces +15 added lines, -5 removed lines

@@ -159,14 +159,24 @@
 
     public function import($data) {
 
-        if (isset($data->headers)) $this->setHeaders($data->headers);
-        if (isset($data->status)) $this->setStatus($data->status);
-        if (isset($data->content)) $this->setContent($data->content);
-        if (isset($data->location)) $this->setLocation($data->location);
+        if (isset($data->headers)) {
+            $this->setHeaders($data->headers);
+        }
+        if (isset($data->status)) {
+            $this->setStatus($data->status);
+        }
+        if (isset($data->content)) {
+            $this->setContent($data->content);
+        }
+        if (isset($data->location)) {
+            $this->setLocation($data->location);
+        }
 
         if (isset($data->cookies) && is_array($data->cookies)) {
             $cookies = $this->getCookies();
-            foreach ($data->cookies as $name => $cookie) $cookies->add($cookie);
+            foreach ($data->cookies as $name => $cookie) {
+                $cookies->add($cookie);
+            }
         }
 
     }

Spacing +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
         ) {
 
             $headers = $this->getHeaders();
-            $timestamp = (int) $this->getTime()->format('U')+$ttl;
+            $timestamp = (int)$this->getTime()->format('U')+$ttl;
 
             if ($ttl > 0) {
 

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/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');