comodojo / dispatcher.framework

src/ObjectRoute/ObjectRoute.php

Braces +9 added lines, -6 removed lines

@@ -186,8 +186,7 @@ 
 
             $this->cache = false;
 
-        }
-        else {
+        } else {
 
             $cache = strtoupper($cache);
 
@@ -279,7 +278,9 @@ 
      */
     public function getHeader($header) {
 
-        if ( isset($this->headers[$header]) ) return $this->headers[$header];
+        if ( isset($this->headers[$header]) ) {
+            return $this->headers[$header];
+        }
 
         return null;
 
@@ -344,9 +345,11 @@ 
      */
     public function getParameter($parameter) {
 
-        if ( isset($this->parameters[$parameter]) ) return $this->parameters[$parameter];
-
-        else return null;
+        if ( isset($this->parameters[$parameter]) ) {
+            return $this->parameters[$parameter];
+        } else {
+            return null;
+        }
 
     }
 

src/Dispatcher.php

Braces +85 added lines, -50 removed lines

@@ -189,7 +189,9 @@ 
 
         // Before composing the object request, remember to define the current (absolute) dispatcher baseurl
         // (if not specified in dispatcher-config)
-        if ( !defined("DISPATCHER_BASEURL") ) define("DISPATCHER_BASEURL",$this->urlGetAbsolute($request_service));
+        if ( !defined("DISPATCHER_BASEURL") ) {
+            define("DISPATCHER_BASEURL",$this->urlGetAbsolute($request_service));
+        }
 
         // Now let's compose request object
 
@@ -224,22 +226,24 @@ 
 
             if ( strtoupper($type) == "ROUTE" ) {
 
-                if ( $relative ) $this->routingtable->setRoute($service, $type, DISPATCHER_SERVICES_FOLDER.$target, $parameters);
-
-                else $this->routingtable->setRoute($service, $type, $target, $parameters);
-
-            }
-
-            else if ( strtoupper($type) == "REDIRECT" ) {
+                if ( $relative ) {
+                    $this->routingtable->setRoute($service, $type, DISPATCHER_SERVICES_FOLDER.$target, $parameters);
+                } else {
+                    $this->routingtable->setRoute($service, $type, $target, $parameters);
+                }
 
-                if ( $relative ) $this->routingtable->setRoute($service, $type, DISPATCHER_BASEURL.$target, $parameters);
+            } else if ( strtoupper($type) == "REDIRECT" ) {
 
-                else $this->routingtable->setRoute($service, $type, $target, $parameters);
+                if ( $relative ) {
+                    $this->routingtable->setRoute($service, $type, DISPATCHER_BASEURL.$target, $parameters);
+                } else {
+                    $this->routingtable->setRoute($service, $type, $target, $parameters);
+                }
 
+            } else {
+                $this->routingtable->setRoute($service, $type, $target, $parameters);
             }
 
-            else $this->routingtable->setRoute($service, $type, $target, $parameters);
-
         } catch (Exception $e) {
 
             //debug error but do not stop dispatcher
@@ -380,26 +384,34 @@ 
 
         $fork = $this->events->fire("dispatcher", "DISPATCHER", $this->enabled);
 
-        if ( is_bool($fork)  ) $this->enabled = $fork;
+        if ( is_bool($fork)  ) {
+            $this->enabled = $fork;
+        }
 
         // After building dispatcher instance, fire THE level2 event "dispatcher.request"
         // This default hook will expose current request (ObjectRequest) to callbacks
 
         $fork = $this->events->fire("dispatcher.request", "REQUEST", $this->request);
 
-        if ( $fork instanceof \Comodojo\Dispatcher\ObjectRequest\ObjectRequest ) $this->request = $fork;
+        if ( $fork instanceof \Comodojo\Dispatcher\ObjectRequest\ObjectRequest ) {
+            $this->request = $fork;
+        }
 
         // Fire level3 event "dispatcher.request.[method]"
         
         $fork = $this->events->fire("dispatcher.request.".$this->request_method, "REQUEST", $this->request);
 
-        if ( $fork instanceof \Comodojo\Dispatcher\ObjectRequest\ObjectRequest ) $this->request = $fork;
+        if ( $fork instanceof \Comodojo\Dispatcher\ObjectRequest\ObjectRequest ) {
+            $this->request = $fork;
+        }
 
         // Fire level3 event "dispatcher.request.[service]"
         
         $fork = $this->events->fire("dispatcher.request.".$this->request->getService(), "REQUEST", $this->request);
 
-        if ( $fork instanceof \Comodojo\Dispatcher\ObjectRequest\ObjectRequest ) $this->request = $fork;
+        if ( $fork instanceof \Comodojo\Dispatcher\ObjectRequest\ObjectRequest ) {
+            $this->request = $fork;
+        }
 
         // Fire special event, it will not modify request
 
@@ -426,7 +438,9 @@ 
 
         $fork = $this->events->fire("dispatcher.routingtable", "TABLE", $this->routingtable);
 
-        if ( $fork instanceof \Comodojo\Dispatcher\ObjectRoutingTable\ObjectRoutingTable ) $this->routingtable = $fork;
+        if ( $fork instanceof \Comodojo\Dispatcher\ObjectRoutingTable\ObjectRoutingTable ) {
+            $this->routingtable = $fork;
+        }
 
         // Retrieve current route from routing table
 
@@ -467,7 +481,9 @@ 
             unset($preroute["parameters"]["ttl"]);
         }
         if ( isset($preroute["parameters"]["headers"]) ) {
-            if ( is_array($preroute["parameters"]["headers"]) ) foreach ($preroute["parameters"]["headers"] as $header => $value) $this->serviceroute->setHeader($header, $value);
+            if ( is_array($preroute["parameters"]["headers"]) ) {
+                foreach ($preroute["parameters"]["headers"] as $header => $value) $this->serviceroute->setHeader($header, $value);
+            }
             unset($preroute["parameters"]["headers"]);
         }
         if ( isset($preroute["parameters"]["accessControl"]) ) {
@@ -486,15 +502,21 @@ 
 
         $fork = $this->events->fire("dispatcher.serviceroute", "ROUTE", $this->serviceroute);
 
-        if ( $fork instanceof \Comodojo\Dispatcher\ObjectRoute\ObjectRoute ) $this->serviceroute = $fork;
+        if ( $fork instanceof \Comodojo\Dispatcher\ObjectRoute\ObjectRoute ) {
+            $this->serviceroute = $fork;
+        }
 
         $fork = $this->events->fire("dispatcher.serviceroute.".$this->serviceroute->getType(), "ROUTE", $this->serviceroute);
 
-        if ( $fork instanceof \Comodojo\Dispatcher\ObjectRoute\ObjectRoute ) $this->serviceroute = $fork;
+        if ( $fork instanceof \Comodojo\Dispatcher\ObjectRoute\ObjectRoute ) {
+            $this->serviceroute = $fork;
+        }
 
         $fork = $this->events->fire("dispatcher.serviceroute.".$this->serviceroute->getService(), "ROUTE", $this->serviceroute);
 
-        if ( $fork instanceof \Comodojo\Dispatcher\ObjectRoute\ObjectRoute ) $this->serviceroute = $fork;
+        if ( $fork instanceof \Comodojo\Dispatcher\ObjectRoute\ObjectRoute ) {
+            $this->serviceroute = $fork;
+        }
 
         // Fire special event, it will not modify route
 
@@ -621,7 +643,9 @@ 
             $scr = explode('/', $_SERVER['SCRIPT_NAME']);
 
             for($i= 0;$i < sizeof($scr);$i++) {
-                if ($uri[$i] == $scr[$i]) unset($uri[$i]);
+                if ($uri[$i] == $scr[$i]) {
+                    unset($uri[$i]);
+                }
             }
 
             $service_matrix = array_values($uri);
@@ -634,16 +658,14 @@ 
 
                 $service_attributes = empty($last) ? array_slice($service_matrix, 1, -1) : array_slice($service_matrix, 1);
 
-            }
-            else {
+            } else {
 
                 $service_requested = "default";
                 $service_attributes = Array();
 
             }
 
-        }
-        else {
+        } else {
 
             $service_matrix = $_GET;
 
@@ -653,8 +675,7 @@ 
                 unset($service_matrix["service"]);
                 $service_attributes = $service_matrix;
 
-            }
-            else {
+            } else {
 
                 $service_requested = "";
                 $service_attributes = Array();
@@ -698,9 +719,9 @@ 
 
         $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '') . '://';
 
-        if ( is_null($service) ) $uri = "";
-
-        else {
+        if ( is_null($service) ) {
+            $uri = "";
+        } else {
 
             $self = $_SERVER['PHP_SELF'];
 
@@ -755,7 +776,9 @@ 
 
     private function attributesMatch($provided, $expected, $liked) {
 
-        if ( $this->working_mode == "STANDARD" ) return $this->parametersMatch($provided, $expected, $liked);
+        if ( $this->working_mode == "STANDARD" ) {
+            return $this->parametersMatch($provided, $expected, $liked);
+        }
 
         $attributes = Array();
 
@@ -763,15 +786,13 @@ 
         $esize = sizeof($expected);
         $lsize = sizeof($liked);
 
-        if ( $psize < $esize ) throw new DispatcherException("Conversation error", 400);
-
-        else if ( $psize == $esize ) {
+        if ( $psize < $esize ) {
+            throw new DispatcherException("Conversation error", 400);
+        } else if ( $psize == $esize ) {
 
             $attributes = $psize == 0 ? array() : array_combine($expected, $provided);
 
-        }
-
-        else {
+        } else {
 
             if ( $esize == 0 ) {
 
@@ -797,13 +818,11 @@ 
 
                 $l_attributes = array_combine(array_slice($liked, 0, $lvaluessize), $lvalues);
 
-            }
-            else if ( $lvaluessize == $lsize ) {
+            } else if ( $lvaluessize == $lsize ) {
 
                 $l_attributes = $lvaluessize == 0 ? array() : array_combine($liked, $lvalues);
 
-            }
-            else {
+            } else {
 
                 if ( $lsize == 0 ) {
 
@@ -833,7 +852,9 @@ 
 
         foreach ($expected as $parameter) {
 
-            if ( !isset($provided[$parameter]) ) throw new DispatcherException("Conversation error", 400);
+            if ( !isset($provided[$parameter]) ) {
+                throw new DispatcherException("Conversation error", 400);
+            }
 
         }
 
@@ -873,13 +894,17 @@ 
 
         // If there's no cache for this request, use routing information to find service
 
-        if ( (include($target)) === false ) throw new DispatcherException("Cannot run service", 500);
+        if ( (include($target)) === false ) {
+            throw new DispatcherException("Cannot run service", 500);
+        }
 
         // Find a service implementation and try to init it
 
         $service_class = $route->getClass();
 
-        if ( empty($service_class) ) throw new DispatcherException("Cannot run service", 500);
+        if ( empty($service_class) ) {
+            throw new DispatcherException("Cannot run service", 500);
+        }
 
         $service_class = "\\Comodojo\\Dispatcher\\Service\\".$service_class;
 
@@ -1006,13 +1031,17 @@ 
 
         $fork = $this->events->fire("dispatcher.result", "RESULT", $route);
 
-        if ( $fork instanceof \Comodojo\Dispatcher\ObjectResult\ObjectResultInterface ) $route = $fork;
+        if ( $fork instanceof \Comodojo\Dispatcher\ObjectResult\ObjectResultInterface ) {
+            $route = $fork;
+        }
 
         // Fire second hook (level2), as specified above
 
         $fork = $this->events->fire($hook, "RESULT", $route);
 
-        if ( $fork instanceof \Comodojo\Dispatcher\ObjectResult\ObjectResultInterface ) $route = $fork;
+        if ( $fork instanceof \Comodojo\Dispatcher\ObjectResult\ObjectResultInterface ) {
+            $route = $fork;
+        }
 
         // Now select and fire last hook (level3)
         // This means that event engine will fire something like "dispatcher.route.200"
@@ -1020,13 +1049,17 @@ 
 
         $fork = $this->events->fire($hook.".".$route->getStatusCode(), "RESULT", $route);
 
-        if ( $fork instanceof \Comodojo\Dispatcher\ObjectResult\ObjectResultInterface ) $route = $fork;
+        if ( $fork instanceof \Comodojo\Dispatcher\ObjectResult\ObjectResultInterface ) {
+            $route = $fork;
+        }
 
         // Fire special event, it may modify result
 
         $fork = $this->events->fire("dispatcher.result.#", "RESULT", $route);
 
-        if ( $fork instanceof \Comodojo\Dispatcher\ObjectResult\ObjectResultInterface ) $route = $fork;
+        if ( $fork instanceof \Comodojo\Dispatcher\ObjectResult\ObjectResultInterface ) {
+            $route = $fork;
+        }
 
         // After hooks:
         // - store cache
@@ -1048,7 +1081,9 @@ 
 
         $this->header->free();
 
-        if ( $cache == "CLIENT" OR $cache == "BOTH" ) $this->header->setClientCache($this->serviceroute->getTtl());
+        if ( $cache == "CLIENT" OR $cache == "BOTH" ) {
+            $this->header->setClientCache($this->serviceroute->getTtl());
+        }
 
         $this->header->setContentType($route->getContentType(), $route->getCharset());
 

src/Serialization.php

Braces +20 added lines, -8 removed lines

@@ -39,7 +39,9 @@ 
      */
     final public function toJson($data, $flags=null) {
 
-        if ( !( is_array($data) OR is_object($data) ) ) throw new Exception("Invalid data for JSON serialization");
+        if ( !( is_array($data) OR is_object($data) ) ) {
+            throw new Exception("Invalid data for JSON serialization");
+        }
 
         return json_encode($data, $flags);
 
@@ -57,9 +59,13 @@ 
      */
     final public function toXml($data, $prettify=false) {
 
-        if ( !( is_array($data) OR is_object($data) ) ) throw new Exception("Invalid data for XML serialization");
+        if ( !( is_array($data) OR is_object($data) ) ) {
+            throw new Exception("Invalid data for XML serialization");
+        }
 
-        if ( is_object($data) ) $data = $this->objectToArray($data);
+        if ( is_object($data) ) {
+            $data = $this->objectToArray($data);
+        }
 
         $xmlEngine = new XML();
         
@@ -103,9 +109,13 @@ 
      */
     final public function toYaml($data) {
 
-        if ( !( is_array($data) OR is_object($data) ) ) throw new Exception("Invalid data for XML serialization");
+        if ( !( is_array($data) OR is_object($data) ) ) {
+            throw new Exception("Invalid data for XML serialization");
+        }
 
-        if ( is_object($data) ) $data = $this->objectToArray($data);
+        if ( is_object($data) ) {
+            $data = $this->objectToArray($data);
+        }
 
         return \Spyc::YAMLDump($data);
 
@@ -158,7 +168,9 @@ 
         
         foreach($xmlStringArray as $k=>$tag){
 
-            if ($tag == "") continue;
+            if ($tag == "") {
+                continue;
+            }
             
             if ($tag[0]=="<" AND $tag[1] != "/") {
 
@@ -203,9 +215,9 @@ 
 
             return $array;
 
+        } else {
+            return $stdObj;
         }
-        
-        else return $stdObj;
 
     }
 

src/Cache.php

Braces +15 added lines, -14 removed lines

@@ -95,8 +95,7 @@ 
 
                 return false;
 
-            }
-            else {
+            } else {
 
                 $this->logger->error('Empty data, nothign to cache');
 
@@ -120,8 +119,7 @@ 
             
             if ($this->fail_silently) {
                 return false;
-            }
-            else {
+            } else {
                 throw new IOException("Error writing to cache");
             }
         }
@@ -176,8 +174,7 @@ 
 
                     return false;
 
-                }
-                else {
+                } else {
 
                     throw new IOException("Error reading from cache");
 
@@ -191,10 +188,10 @@ 
                 "object"    =>  $u_data
              );
 
+        } else {
+            return false;
         }
         
-        else return false;
-        
     }
 
     /**
@@ -226,17 +223,20 @@ 
             while( false !== ( $cache_file = readdir($cache_path) ) ) {
 
                 if ( pathinfo($cache_file, PATHINFO_EXTENSION) == "cache" ) {
-                    if ( unlink( $this->cache_path . ( $this->cache_path[strlen($this->cache_path)-1] == "/" ? "" : "/" ) . $cache_file ) == false ) return false;
-                    else $cache_files_number++;
+                    if ( unlink( $this->cache_path . ( $this->cache_path[strlen($this->cache_path)-1] == "/" ? "" : "/" ) . $cache_file ) == false ) {
+                        return false;
+                    } else {
+                        $cache_files_number++;
+                    }
+                } else {
+                    continue;
                 }
-                else continue;
                 
             }
           
             closedir($cache_path);
 
-        }
-        else {
+        } else {
 
             $this->logger->info('Purging request cache', array(
                 'REQUEST' => $request
@@ -251,8 +251,9 @@ 
                 $unlink = unlink($cacheFile);
                 $cache_files_number = $unlink ? 1 : false;
 
+            } else {
+                $cache_files_number = 0;
             }
-            else $cache_files_number = 0;
 
         }
 

src/ObjectRoutingTable/ObjectRoutingTable.php

Braces +22 added lines, -14 removed lines

@@ -121,7 +121,9 @@ 
 
         // If service is null, route to landing or (if not specified) to default route
 
-        if ( empty($service) ) return $this->routeToLanding();
+        if ( empty($service) ) {
+            return $this->routeToLanding();
+        }
 
         // If service is in table, check if it is routable (in case of "ROUTE" route).
         // If true, route request
@@ -131,14 +133,16 @@ 
 
             if ( $this->table[$service]["type"] == "ROUTE" ) {
 
-                if ( $this->routable($this->table[$service]["target"]) ) return $this->table[$service];
-
-                else return $this->routeToNowhere();
+                if ( $this->routable($this->table[$service]["target"]) ) {
+                    return $this->table[$service];
+                } else {
+                    return $this->routeToNowhere();
+                }
 
+            } else {
+                return $this->table[$service];
             }
 
-            else return $this->table[$service];
-
         }
 
         // If autoroute is enabled, try to match service name with a service file.
@@ -156,7 +160,9 @@ 
 
         // If a route cannot be traced, emit a 404 - not found - response
 
-        else return $this->routeToNotfound();
+        else {
+            return $this->routeToNotfound();
+        }
 
     }
 
@@ -180,9 +186,11 @@ 
      */
     private function routable($target, $relative=false) {
 
-        if ( $relative ) return is_readable(DISPATCHER_SERVICES_FOLDER.$target) ? true : false;
-
-        else return is_readable($target) ? true : false;
+        if ( $relative ) {
+            return is_readable(DISPATCHER_SERVICES_FOLDER.$target) ? true : false;
+        } else {
+            return is_readable($target) ? true : false;
+        }
 
     }
 
@@ -197,10 +205,10 @@ 
 
             return $this->table[""];
 
+        } else {
+            return $this->routeToDefault();
         }
 
-        else return $this->routeToDefault();
-
     }
 
     /**
@@ -214,10 +222,10 @@ 
 
             return $this->table["default"];
 
+        } else {
+            return $this->routeToNotfound();
         }
 
-        else return $this->routeToNotfound();
-
     }
 
     /**

src/ObjectRequest/ObjectRequest.php

Braces +8 added lines, -4 removed lines

@@ -165,9 +165,11 @@ 
      */
     public function setAttribute($name=null, $value) {
 
-        if ( is_null($name) ) array_push($this->attributes, $value);
-
-        else $this->attributes[$name] = $value;
+        if ( is_null($name) ) {
+            array_push($this->attributes, $value);
+        } else {
+            $this->attributes[$name] = $value;
+        }
 
         return $this;
 
@@ -417,7 +419,9 @@ 
      */
     public function getHeader($header) {
 
-        if ( isset($this->headers[$header]) ) return $this->headers[$header];
+        if ( isset($this->headers[$header]) ) {
+            return $this->headers[$header];
+        }
 
         return null;
 

src/Header.php

Braces +31 added lines, -16 removed lines

@@ -77,9 +77,11 @@ 
      */
     final public function get($header) {
 
-        if ( array_key_exists($header, $this->headers) ) return $this->headers[$header];
-
-        else return null;
+        if ( array_key_exists($header, $this->headers) ) {
+            return $this->headers[$header];
+        } else {
+            return null;
+        }
 
     }
 
@@ -163,10 +165,16 @@ 
 
             case 304: //Not Modified
 
-            if ( $value === false ) header($_SERVER["SERVER_PROTOCOL"].' 304 Not Modified');
-            else header('Last-Modified: '.gmdate('D, d M Y H:i:s', $value).' GMT', true, 304);
+            if ( $value === false ) {
+                header($_SERVER["SERVER_PROTOCOL"].' 304 Not Modified');
+            } else {
+                header('Last-Modified: '.gmdate('D, d M Y H:i:s', $value).' GMT', true, 304);
+            }
 
-                if ($contentLength !== 0) header('Content-Length: '.$contentLength); //is it needed?
+                if ($contentLength !== 0) {
+                    header('Content-Length: '.$contentLength);
+                }
+                //is it needed?
 
                 $this->processExtraHeaders($this->headers);
 
@@ -240,8 +248,7 @@ 
         if ( $ttl > 0 ) {
             $this->set("Cache-Control","max-age=".$ttl.", must-revalidate");
             $this->set("Expires",gmdate("D, d M Y H:i:s", (int)$this->current_time + $ttl)." GMT");
-        }
-        else {
+        } else {
             $this->set("Cache-Control","no-cache, must-revalidate");
             $this->set("Expires","Mon, 26 Jul 1997 05:00:00 GMT");
         }
@@ -260,8 +267,11 @@ 
     public function setContentType($type, $charset=null) {
 
 
-        if ( is_null($charset) ) $this->set("Content-type",strtolower($type));
-        else $this->set("Content-type",strtolower($type)."; charset=".$charset);
+        if ( is_null($charset) ) {
+            $this->set("Content-type",strtolower($type));
+        } else {
+            $this->set("Content-type",strtolower($type)."; charset=".$charset);
+        }
 
         return $this;
 
@@ -276,13 +286,15 @@ 
 
         $headers = '';
 
-        if (function_exists('getallheaders')) $headers = getallheaders();
-
-        else {
+        if (function_exists('getallheaders')) {
+            $headers = getallheaders();
+        } else {
 
             foreach ($_SERVER as $name => $value) {
 
-                if (substr($name, 0, 5) == 'HTTP_') $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
+                if (substr($name, 0, 5) == 'HTTP_') {
+                    $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
+                }
             }
 
         }
@@ -300,8 +312,11 @@ 
 
         foreach ( $headers as $header => $value ) {
 
-            if ( is_null($value) ) header($header, true);
-            else  header($header.": ".$value, true);
+            if ( is_null($value) ) {
+                header($header, true);
+            } else {
+                header($header.": ".$value, true);
+            }
 
         }
 

src/ObjectResult/ObjectRedirect.php

Braces +3 added lines, -1 removed lines

@@ -173,7 +173,9 @@
      */
     public function getHeader($header) {
 
-        if ( isset($this->headers[$header]) ) return $this->headers[$header];
+        if ( isset($this->headers[$header]) ) {
+            return $this->headers[$header];
+        }
 
         return null;
 

src/ObjectResult/ObjectSuccess.php

Braces +3 added lines, -1 removed lines

@@ -175,7 +175,9 @@
      */
     public function getHeader($header) {
 
-        if ( isset($this->headers[$header]) ) return $this->headers[$header];
+        if ( isset($this->headers[$header]) ) {
+            return $this->headers[$header];
+        }
 
         return null;