comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Router/Table.php

Spacing +7 added lines, -7 removed lines

@@ -136,9 +136,9 @@ 
 
     public function load($routes) {
 
-        if ( !empty($routes) ) {
+        if (!empty($routes)) {
 
-            foreach( $routes as $name => $route ) {
+            foreach ($routes as $name => $route) {
 
                 $this->add($route['route'], $route['type'], $route['class'], $route['parameters']);
                 // $this->add($name, $route['type'], $route['class'], $route['parameters']);
@@ -156,11 +156,11 @@ 
 
     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();
 
-        if ( is_null($data) ) {
+        if (is_null($data)) {
 
             $this->routes = [];
 
@@ -176,11 +176,11 @@ 
 
     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');
 
-        if ( $this->cache->dump($this->routes, $ttl) ) {
+        if ($this->cache->dump($this->routes, $ttl)) {
             $this->logger->debug("Routing table saved to cache");
         } else {
             $this->logger->warning("Cannot save routing table to cache");
@@ -198,7 +198,7 @@ 
             ->setClassName($class) // Class to be invoked
             ->setParameters($parameters); // Parameters passed via the composer.json configuration (cache, ttl, etc...)
 
-        $this->logger->debug("Route table - route: " . implode("/", $folders));
+        $this->logger->debug("Route table - route: ".implode("/", $folders));
 
         // This method generate a global regular expression which will be able to match all the URI supported by the route
         $regex = $this->parser->read($folders, $route);

Braces +6 added lines, -2 removed lines

@@ -156,7 +156,9 @@ 
 
     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();
 
@@ -176,7 +178,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');
 

src/Comodojo/Dispatcher/Router/Parser.php

Spacing +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
                 return $this->read(
                     $folders,
                     $value,
-                    $regex.'(?:\/'.$param_regex.')'. (($param_required)?'{1}':'?')
+                    $regex.'(?:\/'.$param_regex.')'.(($param_required) ? '{1}' : '?')
                 );
 
             } else {
@@ -161,7 +161,7 @@ 
          * If the field is required, the regular expression is completed with a '{1}' (which make it compulsory),
          * otherwise a '?' is added.
          */
-        return '(?P<' . $key . '>' . $string . ')' . (($field_required)?'{1}':'?');
+        return '(?P<'.$key.'>'.$string.')'.(($field_required) ? '{1}' : '?');
 
     }
 

Braces +3 added lines, -1 removed lines

@@ -96,7 +96,9 @@
                      */
                     $param_regex .= $this->param($key, $string, $value);
 
-                    if ($value->isQueryRequired($key)) $param_required = true;
+                    if ($value->isQueryRequired($key)) {
+                        $param_required = true;
+                    }
 
                     $this->logger->debug("Route parser - parameter regex: $param_regex");
 

src/Comodojo/Dispatcher/Router/Model.php

Spacing +12 added lines, -12 removed lines

@@ -106,23 +106,23 @@ 
 
     public function route(Request $request) {
 
-        $method = (string) $request->getMethod();
+        $method = (string)$request->getMethod();
 
         $methods = $this->configuration->get('allowed-http-methods');
 
-        if ( !empty($methods) && in_array($method, $methods) === false ) {
+        if (!empty($methods) && in_array($method, $methods) === false) {
 
             throw new DispatcherException("Method not allowed", 0, null, 405, array(
-                "Allow" => implode(",",$methods)
+                "Allow" => implode(",", $methods)
             ));
 
         }
 
         $this->setRequest($request);
 
-        if ( $this->bypass_routing === false ) {
+        if ($this->bypass_routing === false) {
 
-            if ( !$this->parse() ) throw new DispatcherException("Unable to find a valid route for the specified uri", 0, null, 404);
+            if (!$this->parse()) throw new DispatcherException("Unable to find a valid route for the specified uri", 0, null, 404);
 
         }
 
@@ -134,7 +134,7 @@ 
 
         $class = $this->route->getClassName();
 
-        if ( class_exists($class) ) {
+        if (class_exists($class)) {
 
             // All the route parameters are also added to the query parameters
             foreach ($this->route->getRequestParameters() as $parameter => $value) {
@@ -162,13 +162,13 @@ 
 
         $this->setResponse($response);
 
-        if ( is_null($this->route) ) {
+        if (is_null($this->route)) {
 
             throw new DispatcherException("Route has not been loaded!");
 
         }
 
-        if ( $this->bypass_service ) {
+        if ($this->bypass_service) {
 
             return;
 
@@ -176,15 +176,15 @@ 
 
         $service = $this->getServiceInstance();
 
-        if ( !is_null($service) ) {
+        if (!is_null($service)) {
 
             $result = "";
 
-            $method = (string) $this->getRequest()->getMethod();
+            $method = (string)$this->getRequest()->getMethod();
 
             $methods = $service->getImplementedMethods();
 
-            if ( in_array($method, $methods) ) {
+            if (in_array($method, $methods)) {
 
                 $callable = $service->getMethod($method);
 
@@ -227,7 +227,7 @@ 
         foreach ($this->table->getRoutes() as $regex => $value) {
 
             // The current uri is checked against all the global regular expressions associated with the routes
-            if ( preg_match("/" . $regex . "/", $path, $matches) ) {
+            if (preg_match("/".$regex."/", $path, $matches)) {
 
                 /* If a route is matched, all the bits of the route string are evalued in order to create
                  * new query parameters which will be available for the service class

Braces +3 added lines, -1 removed lines

@@ -122,7 +122,9 @@
 
         if ( $this->bypass_routing === false ) {
 
-            if ( !$this->parse() ) throw new DispatcherException("Unable to find a valid route for the specified uri", 0, null, 404);
+            if ( !$this->parse() ) {
+                throw new DispatcherException("Unable to find a valid route for the specified uri", 0, null, 404);
+            }
 
         }
 

src/Comodojo/Dispatcher/Output/Processor.php

Spacing +2 added lines, -2 removed lines

@@ -75,13 +75,13 @@
 
         $status = $response->getStatus()->get();
 
-        if ( !$this->codes->exists($status) ) throw new Exception("Invalid HTTP status code in response");
+        if (!$this->codes->exists($status)) throw new Exception("Invalid HTTP status code in response");
 
         $message = $this->codes->getMessage($status);
 
         $response->getHeaders()->send();
 
-        header(sprintf('HTTP/%s %s %s', (string) $request->getVersion(), $status, $message), true, $status);
+        header(sprintf('HTTP/%s %s %s', (string)$request->getVersion(), $status, $message), true, $status);
 
         $response->getCookies()->save();
 

Braces +3 added lines, -1 removed lines

@@ -75,7 +75,9 @@
 
         $status = $response->getStatus()->get();
 
-        if ( !$this->codes->exists($status) ) throw new Exception("Invalid HTTP status code in response");
+        if ( !$this->codes->exists($status) ) {
+            throw new Exception("Invalid HTTP status code in response");
+        }
 
         $message = $this->codes->getMessage($status);
 

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

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
         $location = $this->response->getLocation()->get();
 
-        if ( $location != null ) $this->response->getHeaders()->set("Location", $location);
+        if ($location != null) $this->response->getHeaders()->set("Location", $location);
 
         parent::consolidate();
 

Braces +3 added lines, -1 removed lines

@@ -30,7 +30,9 @@
 
         $location = $this->response->getLocation()->get();
 
-        if ( $location != null ) $this->response->getHeaders()->set("Location", $location);
+        if ( $location != null ) {
+            $this->response->getHeaders()->set("Location", $location);
+        }
 
         parent::consolidate();
 

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

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         $type = $this->response->getContent()->type();
         $charset = $this->response->getContent()->charset();
 
-        if ( is_null($charset) ) {
+        if (is_null($charset)) {
             $this->response->getHeaders()->set("Content-type", strtolower($type));
         } else {
             $this->response->getHeaders()->set("Content-type", strtolower($type)."; charset=".$charset);

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

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         // 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();
 

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/Preprocessor/Status301.php

Spacing +2 added lines, -2 removed lines

@@ -32,13 +32,13 @@
 
         $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);
 
         $content = $this->response->getContent();
 
-        if ( empty($content->get()) ) {
+        if (empty($content->get())) {
 
             $content->set(sprintf('<!DOCTYPE html>
 <html>

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/Cache/ServerCache.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
 
         $cache_object = $this->getCache()->setNamespace(self::$cache_namespace)->get($name);
 
-        if ( is_null($cache_object) ) return false;
+        if (is_null($cache_object)) return false;
 
         $response->import($cache_object);
 
@@ -67,15 +67,15 @@ 
 
         $name = self::getCacheName($request);
 
-        $method = (string) $request->getMethod();
+        $method = (string)$request->getMethod();
 
         $status = $response->getStatus()->get();
 
         if (
-            ( $cache == 'SERVER' || $cache == 'BOTH' ) &&
+            ($cache == 'SERVER' || $cache == 'BOTH') &&
             in_array($method, self::$cachable_methods) &&
             in_array($status, self::$cachable_statuses)
-        ){
+        ) {
 
             $this->getCache()
                 ->setNamespace(self::$cache_namespace)
@@ -87,7 +87,7 @@ 
 
     private static function getCacheName(Request $request) {
 
-        return md5( (string) $request->getMethod() . (string) $request->getUri() );
+        return md5((string)$request->getMethod().(string)$request->getUri());
 
     }
 

Braces +3 added lines, -1 removed lines

@@ -47,7 +47,9 @@
 
         $cache_object = $this->getCache()->setNamespace(self::$cache_namespace)->get($name);
 
-        if ( is_null($cache_object) ) return false;
+        if ( is_null($cache_object) ) {
+            return false;
+        }
 
         $response->import($cache_object);