comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Request/Headers.php

Spacing +3 added lines, -3 removed lines

@@ -41,13 +41,13 @@
      */
     private static function getHeaders() {
 
-        if ( function_exists('getallheaders') ) return getallheaders();
+        if (function_exists('getallheaders')) return getallheaders();
 
         $headers = array();
 
-        foreach ( $_SERVER as $name => $value ) {
+        foreach ($_SERVER as $name => $value) {
 
-            if ( substr($name, 0, 5) == 'HTTP_' ) {
+            if (substr($name, 0, 5) == 'HTTP_') {
 
                 $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
 

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
      */
     private static function getHeaders() {
 
-        if ( function_exists('getallheaders') ) return getallheaders();
+        if ( function_exists('getallheaders') ) {
+            return getallheaders();
+        }
 
         $headers = array();
 

src/Comodojo/Dispatcher/Request/Post.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
     private static function getParameters() {
 
-        switch( $_SERVER['REQUEST_METHOD'] ) {
+        switch ($_SERVER['REQUEST_METHOD']) {
 
             case 'POST':
 

src/Comodojo/Dispatcher/Router/Parser.php

Braces +3 added lines, -1 removed lines

@@ -103,7 +103,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("PARAMETER REGEX: " . $param_regex);
 

Spacing +5 added lines, -5 removed lines

@@ -86,9 +86,9 @@ 
                  */
                 foreach ($decoded as $key => $string) {
 
-                    $this->logger->debug("PARAMETER KEY: " . $key);
+                    $this->logger->debug("PARAMETER KEY: ".$key);
 
-                    $this->logger->debug("PARAMETER STRING: " . $string);
+                    $this->logger->debug("PARAMETER STRING: ".$string);
 
                     /* The key and the regex of every paramater is passed to the 'param'
                      * method which will build an appropriate regular expression and will understand
@@ -98,14 +98,14 @@ 
 
                     if ($value->isQueryRequired($key)) $param_required = true;
 
-                    $this->logger->debug("PARAMETER REGEX: " . $param_regex);
+                    $this->logger->debug("PARAMETER REGEX: ".$param_regex);
 
                 }
                 // Once the parameter is analyzed, the result is passed to the next iteration
                 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}' : '?');
 
     }
 

src/Comodojo/Dispatcher/Components/DefaultConfiguration.php

Spacing +2 added lines, -2 removed lines

@@ -48,11 +48,11 @@
 
     private static function urlGetAbsolute() {
 
-        $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '') . '://';
+        $http = 'http'.((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '').'://';
 
         $uri = self::uriGetAbsolute();
 
-        return ( $http . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost') . $uri . "/" );
+        return ($http.(isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost').$uri."/");
 
     }
 

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/Router/Model.php

Braces +5 added lines, -2 removed lines

@@ -105,7 +105,9 @@ 
 
         if (!$this->bypass_routing) {
 
-            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);
+            }
 
         }
 
@@ -133,8 +135,9 @@ 
                 $this->extra
             );
 
+        } else {
+            return null;
         }
-        else return null;
         
     }
 

Spacing +5 added lines, -5 removed lines

@@ -88,10 +88,10 @@ 
 
         $methods = $this->configuration->get('allowed-http-methods');
 
-        if ( ( $methods != null || !empty($methods) ) && in_array($method, $methods) === false ) {
+        if (($methods != null || !empty($methods)) && in_array($method, $methods) === false) {
 
             throw new DispatcherException("Method not allowed", 0, null, 405, array(
-                "Allow" => implode(",",$methods)
+                "Allow" => implode(",", $methods)
             ));
 
         }
@@ -143,7 +143,7 @@ 
 
         }
 
-        if ( $this->bypass_service ) {
+        if ($this->bypass_service) {
 
             return;
 
@@ -159,7 +159,7 @@ 
 
             $methods = $service->getImplementedMethods();
 
-            if ( in_array($method, $methods) ) {
+            if (in_array($method, $methods)) {
 
                 $callable = $service->getMethod($method);
 
@@ -202,7 +202,7 @@ 
         foreach ($this->table->routes 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

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