comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Response/Content.php

Spacing +4 added lines, -4 removed lines

@@ -38,9 +38,9 @@ 
 
     }
 
-    public function set($content=null) {
+    public function set($content = null) {
 
-        if ( !is_scalar($content) && $content != null ) {
+        if (!is_scalar($content) && $content != null) {
 
             throw new Exception("Invalid HTTP content");
 
@@ -54,7 +54,7 @@ 
 
     public function type($type = null) {
 
-        if ( is_null($type) ) {
+        if (is_null($type)) {
 
             return $this->type;
 
@@ -68,7 +68,7 @@ 
 
     public function charset($charset = null) {
 
-        if ( is_null($charset) ) {
+        if (is_null($charset)) {
 
             return $this->charset;
 

src/Comodojo/Dispatcher/Service/AbstractService.php

Spacing +6 added lines, -6 removed lines

@@ -96,9 +96,9 @@ 
 
         $supported_methods = $this->configuration()->get('supported-http-methods');
 
-        if ( is_null($supported_methods) ) $supported_methods = array('GET','PUT','POST','DELETE','OPTIONS','HEAD','TRACE','CONNECT','PURGE');
+        if (is_null($supported_methods)) $supported_methods = array('GET', 'PUT', 'POST', 'DELETE', 'OPTIONS', 'HEAD', 'TRACE', 'CONNECT', 'PURGE');
 
-        if ( method_exists($this, 'any') ) {
+        if (method_exists($this, 'any')) {
 
             return $supported_methods;
 
@@ -106,9 +106,9 @@ 
 
         $implemented_methods = array();
 
-        foreach ( $supported_methods as $method ) {
+        foreach ($supported_methods as $method) {
 
-            if ( method_exists($this, strtolower($method)) ) array_push($implemented_methods,$method);
+            if (method_exists($this, strtolower($method))) array_push($implemented_methods, $method);
 
         }
 
@@ -122,11 +122,11 @@ 
      */
     public function getMethod($method) {
 
-        if ( method_exists($this, strtolower($method)) ) {
+        if (method_exists($this, strtolower($method))) {
 
             return strtolower($method);
 
-        } else if ( method_exists($this, strtolower('any')) ) {
+        } else if (method_exists($this, strtolower('any'))) {
 
             return 'any';
 

Braces +6 added lines, -2 removed lines

@@ -96,7 +96,9 @@ 
 
         $supported_methods = $this->configuration()->get('supported-http-methods');
 
-        if ( is_null($supported_methods) ) $supported_methods = array('GET','PUT','POST','DELETE','OPTIONS','HEAD','TRACE','CONNECT','PURGE');
+        if ( is_null($supported_methods) ) {
+            $supported_methods = array('GET','PUT','POST','DELETE','OPTIONS','HEAD','TRACE','CONNECT','PURGE');
+        }
 
         if ( method_exists($this, 'any') ) {
 
@@ -108,7 +110,9 @@ 
 
         foreach ( $supported_methods as $method ) {
 
-            if ( method_exists($this, strtolower($method)) ) array_push($implemented_methods,$method);
+            if ( method_exists($this, strtolower($method)) ) {
+                array_push($implemented_methods,$method);
+            }
 
         }
 

src/Comodojo/Dispatcher/Router/Route.php

Doc Comments +5 added lines

@@ -90,6 +90,11 @@
 
     }
 
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
     public function getParameter($key) {
 
         return (isset($this->parameters[$key]))?$this->parameters[$key]:null;

Braces +4 added lines, -1 removed lines

@@ -223,7 +223,10 @@
                  */
                 if (preg_match('/^' . $value['regex'] . '$/', $bits[$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->request->query()->set($key, $matches);

Spacing +6 added lines, -6 removed lines

@@ -72,7 +72,7 @@ 
 
     public function getServiceName() {
 
-        return (empty($this->service))?"default":implode('.', $this->service);
+        return (empty($this->service)) ? "default" : implode('.', $this->service);
 
     }
 
@@ -96,7 +96,7 @@ 
 
         $parameters = $this->parameters;
 
-        return (isset($parameters[$key]))?$parameters[$key]:null;
+        return (isset($parameters[$key])) ? $parameters[$key] : null;
 
     }
 
@@ -126,7 +126,7 @@ 
 
         $parameters = $this->request;
 
-        return (isset($parameters[$key]))?$parameters[$key]:null;
+        return (isset($parameters[$key])) ? $parameters[$key] : null;
 
     }
 
@@ -169,7 +169,7 @@ 
 
         $query = $this->query;
 
-        return isset($query[$key])?$query[$key]["required"]:false;
+        return isset($query[$key]) ? $query[$key]["required"] : false;
 
     }
 
@@ -177,7 +177,7 @@ 
 
         $query = $this->query;
 
-        return isset($query[$key])?$query[$key]["regex"]:null;
+        return isset($query[$key]) ? $query[$key]["regex"] : null;
 
     }
 
@@ -218,7 +218,7 @@ 
                 /* 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.
 

src/Comodojo/Dispatcher/Response/Model.php

Spacing +9 added lines, -9 removed lines

@@ -62,7 +62,7 @@ 
         $output_class_name = "\\Comodojo\\Dispatcher\\Response\\Preprocessor\\Status".$status;
 
         // @TODO: this condition will be removed when all preprocessors ready
-        if ( class_exists($output_class_name) ) {
+        if (class_exists($output_class_name)) {
             $output = new $output_class_name($this);
         } else {
             $output = new \Comodojo\Dispatcher\Response\Preprocessor\Status200($this);
@@ -70,13 +70,13 @@ 
 
         $output->consolidate();
 
-        if ( $route != null ) {
+        if ($route != null) {
             $this->setClientCache($request, $route);
         }
 
         // extra checks
 
-        if ( $request->method->get() == 'HEAD' && !in_array($status, array(100,101,102,204,304)) ) {
+        if ($request->method->get() == 'HEAD' && !in_array($status, array(100, 101, 102, 204, 304))) {
             $length = $this->content->length();
             $this->content->set(null);
             if ($length) $this->headers->set('Content-Length', $length);
@@ -86,7 +86,7 @@ 
             $this->headers->delete('Content-Length');
         }
 
-        if ( $request->version->get() == '1.0' && false !== strpos($this->headers->get('Cache-Control'), 'no-cache')) {
+        if ($request->version->get() == '1.0' && false !== strpos($this->headers->get('Cache-Control'), 'no-cache')) {
             $this->headers->set('pragma', 'no-cache');
             $this->headers->set('expires', -1);
         }
@@ -106,15 +106,15 @@ 
             //        the cache layer will be improoved in future versions.
         ) {
 
-            if ( $ttl > 0 ) {
+            if ($ttl > 0) {
 
-                $this->headers->set("Cache-Control","max-age=".$ttl.", must-revalidate");
-                $this->headers->set("Expires",gmdate("D, d M Y H:i:s", (int)$this->getTimestamp() + $ttl)." GMT");
+                $this->headers->set("Cache-Control", "max-age=".$ttl.", must-revalidate");
+                $this->headers->set("Expires", gmdate("D, d M Y H:i:s", (int)$this->getTimestamp()+$ttl)." GMT");
 
             } else {
 
-                $this->headers->set("Cache-Control","no-cache, must-revalidate");
-                $this->headers->set("Expires","Mon, 26 Jul 1997 05:00:00 GMT");
+                $this->headers->set("Cache-Control", "no-cache, must-revalidate");
+                $this->headers->set("Expires", "Mon, 26 Jul 1997 05:00:00 GMT");
 
             }
 

Braces +3 added lines, -1 removed lines

@@ -79,7 +79,9 @@
         if ( $request->method->get() == 'HEAD' && !in_array($status, array(100,101,102,204,304)) ) {
             $length = $this->content->length();
             $this->content->set(null);
-            if ($length) $this->headers->set('Content-Length', $length);
+            if ($length) {
+                $this->headers->set('Content-Length', $length);
+            }
         }
 
         if ($this->headers->get('Transfer-Encoding') != null) {

src/Comodojo/Dispatcher/Response/Status.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
 
     public function set($code) {
 
-        if ( !$this->codes->exists($code) ) {
+        if (!$this->codes->exists($code)) {
 
             throw new Exception("Invalid HTTP Status Code $code");
 
@@ -60,9 +60,9 @@ 
 
     }
 
-    public function description($code=null) {
+    public function description($code = null) {
 
-        if ( is_null($code) ) return $this->codes->getMessage($this->status_code);
+        if (is_null($code)) return $this->codes->getMessage($this->status_code);
         
         return $this->codes->getMessage($code);
 

Braces +3 added lines, -1 removed lines

@@ -62,7 +62,9 @@
 
     public function description($code=null) {
 
-        if ( is_null($code) ) return $this->codes->getMessage($this->status_code);
+        if ( is_null($code) ) {
+            return $this->codes->getMessage($this->status_code);
+        }
         
         return $this->codes->getMessage($code);
 

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

Spacing +1 added lines, -1 removed lines

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

Braces +3 added lines, -1 removed lines

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

src/Comodojo/Dispatcher/Output/Processor.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 
         $status = $this->response->status->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);
 

Braces +3 added lines, -1 removed lines

@@ -61,7 +61,9 @@
 
         $status = $this->response->status->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/Components/HttpStatusCodes.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 
     public function getMessage($code) {
 
-        if ( $this->exists($code) ) return $this->codes[$code];
+        if ($this->exists($code)) return $this->codes[$code];
 
         throw new Exception("Invalid HTTP status code $code");
 

Braces +3 added lines, -1 removed lines

@@ -102,7 +102,9 @@
 
     public function getMessage($code) {
 
-        if ( $this->exists($code) ) return $this->codes[$code];
+        if ( $this->exists($code) ) {
+            return $this->codes[$code];
+        }
 
         throw new Exception("Invalid HTTP status code $code");
 

src/Comodojo/Dispatcher/Router/Table.php

Braces +11 added lines, -6 removed lines

@@ -78,10 +78,11 @@ 
 
         $regex = $this->regex($route);
 
-        if (isset($this->routes[$regex]))
-            return $this->routes[$regex];
-        else
-            return null;
+        if (isset($this->routes[$regex])) {
+                    return $this->routes[$regex];
+        } else {
+                    return null;
+        }
 
     }
 
@@ -139,7 +140,9 @@ 
 
     private function readCache() {
 
-        if ( $this->configuration->get('routing-table-cache') !== true ) return;
+        if ( $this->configuration->get('routing-table-cache') !== true ) {
+            return;
+        }
 
         $this->routes = $this->cache->setNamespace('dispatcherinternals')->get("dispatcher-routes");
 
@@ -157,7 +160,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');
 

Spacing +8 added lines, -8 removed lines

@@ -121,9 +121,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']);
 
@@ -139,11 +139,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 = [];
 
@@ -159,11 +159,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");
@@ -180,14 +180,14 @@ 
             ->setClassName($class) // Class to be invoked
             ->setParameters($parameters); // Parameters passed via the composer.json configuration (cache, ttl, etc...)
 
-        $this->logger->debug("ROUTE: " . implode("/", $folders));
+        $this->logger->debug("ROUTE: ".implode("/", $folders));
 
         //$this->logger->debug("PARAMETERS: " . var_export($value, true));
 
         // 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);
 
-        $this->logger->debug("ROUTE: " . $regex);
+        $this->logger->debug("ROUTE: ".$regex);
 
         //$this->logger->debug("PARAMETERS: " . var_export($value, true));