comodojo / dispatcher.framework

src/Cache.php

Doc Comments +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
      * Constructor method. It only acquire current time and notify that cache is ready
      *
      * @param   float   $time   Dispatcher time
-     * @param   Object  $logger Logger, injected by dispatcher
+     * @param   Debug  $logger Logger, injected by dispatcher
      */
     final public function __construct($time, $logger) {
 

Indentation +1 added lines, -1 removed lines

@@ -189,7 +189,7 @@
                 "bestbefore"=>  $best_before,
                 //"content" =>  $u_data["cache_content"]
                 "object"    =>  $u_data
-             );
+                );
 
         }
         

Spacing +17 added lines, -17 removed lines

@@ -105,9 +105,9 @@ 
             }
         }
         
-        $cacheTag = md5($request) . ".cache";
+        $cacheTag = md5($request).".cache";
 
-        $cacheFile = $this->cache_path . ( $this->cache_path[strlen($this->cache_path)-1] == "/" ? "" : "/" ) . $cacheTag;
+        $cacheFile = $this->cache_path.($this->cache_path[strlen($this->cache_path)-1] == "/" ? "" : "/").$cacheTag;
 
         $f_data = serialize($data);
 
@@ -138,7 +138,7 @@ 
      * 
      * @return  array   An array containing maxage, bestbefore, object (data)
      */
-    final public function get($request, $ttl=DISPATCHER_CACHE_TTL) {
+    final public function get($request, $ttl = DISPATCHER_CACHE_TTL) {
         
         if (!DISPATCHER_CACHE_ENABLED) {
 
@@ -148,19 +148,19 @@ 
 
         }
         
-        $last_time_limit = (int)$this->current_time - $ttl;
+        $last_time_limit = (int)$this->current_time-$ttl;
         
-        $cacheTag = md5($request) . ".cache";
+        $cacheTag = md5($request).".cache";
 
-        $cacheFile = $this->cache_path . ( $this->cache_path[strlen($this->cache_path)-1] == "/" ? "" : "/" ) . $cacheTag;
+        $cacheFile = $this->cache_path.($this->cache_path[strlen($this->cache_path)-1] == "/" ? "" : "/").$cacheTag;
         
         $cache_time = @filemtime($cacheFile);
 
         if (is_readable($cacheFile) AND $cache_time >= $last_time_limit) {
             
-            $max_age = $cache_time + $ttl - (int)$this->current_time;
+            $max_age = $cache_time+$ttl-(int)$this->current_time;
 
-            $best_before = gmdate("D, d M Y H:i:s", $cache_time + $ttl) . " GMT";
+            $best_before = gmdate("D, d M Y H:i:s", $cache_time+$ttl)." GMT";
             
             $data = file_get_contents($cacheFile);
 
@@ -204,16 +204,16 @@ 
      *
      * @return  bool
      */
-    public function purge($request=null) {
+    public function purge($request = null) {
 
-        if ( is_null($request) ) {
+        if (is_null($request)) {
 
             $this->logger->info('Purging whole cache');
 
             $cache_files_number = 0;
 
             $cache_path = opendir($this->cache_path);
-            if ( $cache_path === false ) {
+            if ($cache_path === false) {
 
                 $this->logger->error('Unable to open cache folder', array(
                     'CACHEFOLDER' => $this->cache_path
@@ -223,10 +223,10 @@ 
 
             }
             
-            while( false !== ( $cache_file = readdir($cache_path) ) ) {
+            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;
+                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++;
                 }
                 else continue;
@@ -242,11 +242,11 @@ 
                 'REQUEST' => $request
             ));
 
-            $cacheTag = md5($request) . ".cache";
+            $cacheTag = md5($request).".cache";
 
-            $cacheFile = $this->cache_path . ( $this->cache_path[strlen($this->cache_path)-1] == "/" ? "" : "/" ) . $cacheTag;
+            $cacheFile = $this->cache_path.($this->cache_path[strlen($this->cache_path)-1] == "/" ? "" : "/").$cacheTag;
 
-            if ( is_readable($cacheFile) ) {
+            if (is_readable($cacheFile)) {
 
                 $unlink = unlink($cacheFile);
                 $cache_files_number = $unlink ? 1 : false;

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/Dispatcher.php

Doc Comments +8 added lines, -2 removed lines

@@ -692,7 +692,7 @@ 
     /**
      * Return dispatcher baseurl, no matter the request
      *
-     * @return uri  The baseurl
+     * @return string  The baseurl
      */
     private function urlGetAbsolute($service=null) {
 
@@ -841,6 +841,9 @@ 
 
     }
 
+    /**
+     * @return ObjectResultInterface
+     */
     private function runService(ObjectRequest $request, ObjectRoute $route) {
 
         $method = $request->getMethod();
@@ -973,7 +976,7 @@ 
     /**
      * Route request handling ObjectResult hooks
      *
-     * @param   ObjectResult    $route  An implementation of ObjectResultInterface
+     * @param   ObjectResultInterface    $route  An implementation of ObjectResultInterface
      * @return  string                  Content (stuff that will go on screen)
      */
     private function route(ObjectResultInterface $route) {
@@ -1068,6 +1071,9 @@ 
 
     }
 
+    /**
+     * @param string $result
+     */
     private static function end($result) {
 
         if ( defined('DISPATCHER_PHPUNIT_TEST') && @constant('DISPATCHER_PHPUNIT_TEST') === true ) {

Spacing +72 added lines, -72 removed lines

@@ -181,7 +181,7 @@ 
 
         // Starts composing request object (ObjectRequest)
 
-        list($request_service,$request_attributes) = $this->urlInterpreter($this->working_mode);
+        list($request_service, $request_attributes) = $this->urlInterpreter($this->working_mode);
 
         list($request_parameters, $request_raw_parameters) = $this->deserializeParameters($this->request_method);
 
@@ -189,7 +189,7 @@ 
 
         // 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
 
@@ -218,21 +218,21 @@ 
      * @param   array   $parameters (optional) Service options (cache, ...)
      * @param   bool    $relative   (optional) If true, target will be assumed in default service directory
      */
-    final public function setRoute($service, $type, $target, $parameters=Array(), $relative=true) {
+    final public function setRoute($service, $type, $target, $parameters = Array(), $relative = true) {
 
         try {
 
-            if ( strtoupper($type) == "ROUTE" ) {
+            if (strtoupper($type) == "ROUTE") {
 
-                if ( $relative ) $this->routingtable->setRoute($service, $type, DISPATCHER_SERVICES_FOLDER.$target, $parameters);
+                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" ) {
+            else if (strtoupper($type) == "REDIRECT") {
 
-                if ( $relative ) $this->routingtable->setRoute($service, $type, DISPATCHER_BASEURL.$target, $parameters);
+                if ($relative) $this->routingtable->setRoute($service, $type, DISPATCHER_BASEURL.$target, $parameters);
 
                 else $this->routingtable->setRoute($service, $type, $target, $parameters);
 
@@ -243,7 +243,7 @@ 
         } catch (Exception $e) {
 
             //debug error but do not stop dispatcher
-            $this->logger->warning( 'Unable to set route'.Array('SERVIVE' => $service) );
+            $this->logger->warning('Unable to set route'.Array('SERVIVE' => $service));
 
         }
 
@@ -265,7 +265,7 @@ 
         } catch (Exception $e) {
 
             //debug error but do not stop dispatcher
-            $this->logger->warning( 'Unable to unset route'.Array('SERVIVE' => $service) );
+            $this->logger->warning('Unable to unset route'.Array('SERVIVE' => $service));
 
         }
 
@@ -278,7 +278,7 @@ 
      * @param   string  $callback   The callback (or class if $method is specified)
      * @param   string  $method     (optional) Method for $callback
      */
-    final public function addHook($event, $callback, $method=null) {
+    final public function addHook($event, $callback, $method = null) {
 
         try {
 
@@ -287,11 +287,11 @@ 
         } catch (Exception $e) {
 
             //debug error but do not stop dispatcher
-            $this->logger->warning( 'Unable to add hook'.Array(
+            $this->logger->warning('Unable to add hook'.Array(
                 'CALLBACK' => $callback,
                 'METHOD' => $method,
                 'EVENT' => $event
-            ) );
+            ));
 
         }
 
@@ -303,7 +303,7 @@ 
      * @param   string  $event      The event name
      * @param   string  $callback   The callback (or class if $method is specified)
      */
-    final public function removeHook($event, $callback=null) {
+    final public function removeHook($event, $callback = null) {
 
         try {
 
@@ -312,10 +312,10 @@ 
         } catch (Exception $e) {
 
             //debug error but do not stop dispatcher
-            $this->logger->warning( 'Unable to remove hook'.Array(
+            $this->logger->warning('Unable to remove hook'.Array(
                 'CALLBACK' => $callback,
                 'EVENT' => $event
-            ) );
+            ));
 
         }
 
@@ -327,7 +327,7 @@ 
      * @param   string  $plugin     The plugin name
      * @param   string  $folder     (optional) plugin folder (if omitted, dispatcher will use default one)
      */
-    final public function loadPlugin($plugin, $folder=DISPATCHER_PLUGINS_FOLDER) {
+    final public function loadPlugin($plugin, $folder = DISPATCHER_PLUGINS_FOLDER) {
 
         include $folder.$plugin.".php";
 
@@ -364,7 +364,7 @@ 
      */
     final public function clearCache($all = null) {
 
-        return $this->cacher->purge( $all == true ? null : $this->service_url );
+        return $this->cacher->purge($all == true ? null : $this->service_url);
 
     }
 
@@ -380,26 +380,26 @@ 
 
         $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
 
@@ -407,7 +407,7 @@ 
 
         // Check if dispatcher is enabled
 
-        if ( $this->enabled == false ) {
+        if ($this->enabled == false) {
 
             $route = new ObjectError();
             $route->setStatusCode(503);
@@ -426,7 +426,7 @@ 
 
         $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
 
@@ -443,34 +443,34 @@ 
             ->setType($preroute["type"])
             ->setTarget($preroute["target"]);
 
-        if ( isset($preroute["parameters"]["class"]) ) {
+        if (isset($preroute["parameters"]["class"])) {
             $this->serviceroute->setClass($preroute["parameters"]["class"]);
         } else {
             $t = pathinfo($preroute["target"]);
             $this->serviceroute->setClass(preg_replace('/\\.[^.\\s]{3,4}$/', '', $t["filename"]));
         }
         
-        if ( isset($preroute["parameters"]["redirectCode"]) ) {
+        if (isset($preroute["parameters"]["redirectCode"])) {
             $this->serviceroute->setRedirectCode($preroute["parameters"]["redirectCode"]);
             unset($preroute["parameters"]["redirectCode"]);
         }
-        if ( isset($preroute["parameters"]["errorCode"]) ) {
+        if (isset($preroute["parameters"]["errorCode"])) {
             $this->serviceroute->setErrorCode($preroute["parameters"]["errorCode"]);
             unset($preroute["parameters"]["errorCode"]);
         }
-        if ( isset($preroute["parameters"]["cache"]) ) {
+        if (isset($preroute["parameters"]["cache"])) {
             $this->serviceroute->setCache($preroute["parameters"]["cache"]);
             unset($preroute["parameters"]["cache"]);
         }
-        if ( isset($preroute["parameters"]["ttl"]) ) {
+        if (isset($preroute["parameters"]["ttl"])) {
             $this->serviceroute->setTtl($preroute["parameters"]["ttl"]);
             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 (isset($preroute["parameters"]["headers"])) {
+            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"]) ) {
+        if (isset($preroute["parameters"]["accessControl"])) {
             $this->serviceroute->setRedirectCode($preroute["parameters"]["accessControl"]);
             unset($preroute["parameters"]["accessControl"]);
         }
@@ -486,15 +486,15 @@ 
 
         $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
 
@@ -504,11 +504,11 @@ 
 
         $accesscontrol = preg_replace('/\s+/', '', $this->serviceroute->getAccessControl());
 
-        if ( $accesscontrol != null AND $accesscontrol != "*" ) {
+        if ($accesscontrol != null AND $accesscontrol != "*") {
 
             $origins = explode(",", $accesscontrol);
 
-            if ( !in_array(@$_SERVER['HTTP_ORIGIN'], $origins) ) {
+            if (!in_array(@$_SERVER['HTTP_ORIGIN'], $origins)) {
 
                 $route = new ObjectError();
                 $route->setStatusCode(403)->setContent("Origin not allowed");
@@ -535,7 +535,7 @@ 
             'REDIRECTCODE'  => $this->serviceroute->getRedirectCode()
         ));
 
-        switch($this->serviceroute->getType()) {
+        switch ($this->serviceroute->getType()) {
 
             case "ERROR":
 
@@ -620,7 +620,7 @@ 
             $uri = explode('/', $_SERVER['REQUEST_URI']);
             $scr = explode('/', $_SERVER['SCRIPT_NAME']);
 
-            for($i= 0;$i < sizeof($scr);$i++) {
+            for ($i = 0; $i < sizeof($scr); $i++) {
                 if ($uri[$i] == $scr[$i]) unset($uri[$i]);
             }
 
@@ -694,21 +694,21 @@ 
      *
      * @return uri  The baseurl
      */
-    private function urlGetAbsolute($service=null) {
+    private function urlGetAbsolute($service = null) {
 
-        $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '') . '://';
+        $http = 'http'.((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '').'://';
 
-        if ( is_null($service) ) $uri = "";
+        if (is_null($service)) $uri = "";
 
         else {
 
             $self = $_SERVER['PHP_SELF'];
 
-            $uri = preg_replace("/\/index.php(.*?)$/i","",$self);
+            $uri = preg_replace("/\/index.php(.*?)$/i", "", $self);
 
         }
 
-        return ( $http . $_SERVER['HTTP_HOST'] . $uri . "/" );
+        return ($http.$_SERVER['HTTP_HOST'].$uri."/");
 
     }
 
@@ -732,7 +732,7 @@ 
 
         $parameters = Array();
 
-        switch($method) {
+        switch ($method) {
 
             case 'POST':
 
@@ -755,7 +755,7 @@ 
 
     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,9 +763,9 @@ 
         $esize = sizeof($expected);
         $lsize = sizeof($liked);
 
-        if ( $psize < $esize ) throw new DispatcherException("Conversation error", 400);
+        if ($psize < $esize) throw new DispatcherException("Conversation error", 400);
 
-        else if ( $psize == $esize ) {
+        else if ($psize == $esize) {
 
             $attributes = $psize == 0 ? array() : array_combine($expected, $provided);
 
@@ -773,7 +773,7 @@ 
 
         else {
 
-            if ( $esize == 0 ) {
+            if ($esize == 0) {
 
                 $e_attributes = array();
 
@@ -793,19 +793,19 @@ 
 
             $l_attributes = Array();
 
-            if ( $lvaluessize < $lsize ) {
+            if ($lvaluessize < $lsize) {
 
                 $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 {
 
-                if ( $lsize == 0 ) {
+                if ($lsize == 0) {
 
                     $l_attributes = $lvalues;
 
@@ -833,7 +833,7 @@ 
 
         foreach ($expected as $parameter) {
 
-            if ( !isset($provided[$parameter]) ) throw new DispatcherException("Conversation error", 400);
+            if (!isset($provided[$parameter])) throw new DispatcherException("Conversation error", 400);
 
         }
 
@@ -851,11 +851,11 @@ 
 
         // First of all, check cache (in case of GET request)
 
-        if ( $method == "GET" AND ( $cache == "SERVER" OR $cache == "BOTH" ) ) {
+        if ($method == "GET" AND ($cache == "SERVER" OR $cache == "BOTH")) {
 
             $from_cache = $this->cacher->get($this->service_url, $ttl);
 
-            if ( is_array($from_cache) ) {
+            if (is_array($from_cache)) {
 
                 $maxage = $from_cache["maxage"];
                 $bestbefore = $from_cache["bestbefore"];
@@ -873,13 +873,13 @@ 
 
         // 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;
 
@@ -899,7 +899,7 @@ 
 
         // Check if service supports current HTTP method
 
-        if ( !in_array($method, explode(",", $theservice->getSupportedMethods())) ) {
+        if (!in_array($method, explode(",", $theservice->getSupportedMethods()))) {
 
             throw new DispatcherException("Allow: ".$theservice->getSupportedMethods(), 405);
 
@@ -907,9 +907,9 @@ 
 
         // Check if service implements current HTTP method
 
-        if ( !in_array($method, $theservice->getImplementedMethods()) ) {
+        if (!in_array($method, $theservice->getImplementedMethods())) {
 
-            throw new DispatcherException("Allow: ".implode(",",$theservice->getImplementedMethods()), 501);
+            throw new DispatcherException("Allow: ".implode(",", $theservice->getImplementedMethods()), 501);
 
         }
 
@@ -952,7 +952,7 @@ 
             $return->setService($service)
                 ->setStatusCode($theservice->getStatusCode())
                 ->setContent($result)
-                ->setHeaders( array_merge($theservice->getHeaders(), $route->getHeaders()) )
+                ->setHeaders(array_merge($theservice->getHeaders(), $route->getHeaders()))
                 ->setContentType($theservice->getContentType())
                 ->setCharset($theservice->getCharset());
             
@@ -982,15 +982,15 @@ 
         // This means event engine will fire a dispatcher.[routetype] event
         // In case of wrong instance, create an ObjectError (500, null) instance
 
-        if ( $route instanceof ObjectSuccess ) {
+        if ($route instanceof ObjectSuccess) {
 
             $hook = "dispatcher.route";
 
-        } else if ( $route instanceof ObjectError ) {
+        } else if ($route instanceof ObjectError) {
 
             $hook = "dispatcher.error";
 
-        } else if ( $route instanceof ObjectRedirect ) {
+        } else if ($route instanceof ObjectRedirect) {
 
             $hook = "dispatcher.redirect";
 
@@ -1006,13 +1006,13 @@ 
 
         $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 +1020,13 @@ 
 
         $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
@@ -1035,10 +1035,10 @@ 
 
         $cache = $route instanceof \Comodojo\Dispatcher\ObjectResult\ObjectSuccess ? $this->serviceroute->getCache() : null;
 
-        if ( $this->request_method == "GET" AND 
-            ( $cache == "SERVER" OR $cache == "BOTH" ) AND
+        if ($this->request_method == "GET" AND 
+            ($cache == "SERVER" OR $cache == "BOTH") AND
             $this->result_comes_from_cache == false AND 
-            $route instanceof \Comodojo\Dispatcher\ObjectResult\ObjectSuccess )
+            $route instanceof \Comodojo\Dispatcher\ObjectResult\ObjectSuccess)
         {
 
             $this->cacher->set($this->service_url, $route);
@@ -1048,7 +1048,7 @@ 
 
         $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());
 
@@ -1070,7 +1070,7 @@ 
 
     private static function end($result) {
 
-        if ( defined('DISPATCHER_PHPUNIT_TEST') && @constant('DISPATCHER_PHPUNIT_TEST') === true ) {
+        if (defined('DISPATCHER_PHPUNIT_TEST') && @constant('DISPATCHER_PHPUNIT_TEST') === true) {
 
             return $result;
 

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/Events.php

Doc Comments +2 added lines, -1 removed lines

@@ -47,6 +47,7 @@ 
      * It does nothing special: called at boot time, only notify that events
      * are ready.
      *
+     * @param Debug $logger
      * @return null
      */
     final public function __construct($logger) {
@@ -66,7 +67,7 @@ 
      * @param   string  $callback   Callback (or callback class)
      * @param   string  $method     (optional) callback method
      *
-     * @return  Object  $this
+     * @return  Events  $this
      */
     final public function add($event, $callback, $method=null) {
 

Spacing +15 added lines, -15 removed lines

@@ -68,11 +68,11 @@ 
      *
      * @return  Object  $this
      */
-    final public function add($event, $callback, $method=null) {
+    final public function add($event, $callback, $method = null) {
 
-        if ( is_null($method) ) {
+        if (is_null($method)) {
 
-            if ( isset($this->hooks[$event]) ) array_push($this->hooks[$event], $callback);
+            if (isset($this->hooks[$event])) array_push($this->hooks[$event], $callback);
 
             else $this->hooks[$event] = Array($callback);
 
@@ -80,7 +80,7 @@ 
 
         else {
 
-            if ( isset($this->hooks[$event]) ) array_push($this->hooks[$event], Array($callback, $method));
+            if (isset($this->hooks[$event])) array_push($this->hooks[$event], Array($callback, $method));
 
             else $this->hooks[$event] = Array(Array($callback, $method));
 
@@ -102,9 +102,9 @@ 
      *
      * @return  bool
      */
-    final public function remove($event, $callback=null) {
+    final public function remove($event, $callback = null) {
 
-        if ( is_null($callback) AND isset($this->hooks[$event]) ) {
+        if (is_null($callback) AND isset($this->hooks[$event])) {
 
             unset($this->hooks[$event]);
 
@@ -112,13 +112,13 @@ 
 
         }
 
-        else if ( isset($this->hooks[$event]) ) {
+        else if (isset($this->hooks[$event])) {
 
             foreach ($this->hooks[$event] as $key => $hook) {
 
-                if ( is_array($hook) ) {
+                if (is_array($hook)) {
 
-                    if ( $hook[0] == $callback ) {
+                    if ($hook[0] == $callback) {
 
                         unset($this->hooks[$event][$key]);
 
@@ -129,7 +129,7 @@ 
                 }
                 else {
 
-                    if ( $hook == $callback ) {
+                    if ($hook == $callback) {
 
                         unset($this->hooks[$event][$key]);
 
@@ -166,15 +166,15 @@ 
 
         $value = $data;
 
-        if ( isset($this->hooks[$event]) ) {
+        if (isset($this->hooks[$event])) {
 
-            foreach($this->hooks[$event] as $callback) {
+            foreach ($this->hooks[$event] as $callback) {
 
                 $return_value = null;
 
-                if ( is_array($callback) ) {
+                if (is_array($callback)) {
 
-                    if ( is_callable(Array($callback[0], $callback[1])) ) {
+                    if (is_callable(Array($callback[0], $callback[1]))) {
 
                         try {
 
@@ -210,7 +210,7 @@ 
                 }
                 else {
 
-                    if ( is_callable($callback) ) {
+                    if (is_callable($callback)) {
 
                         try {
 

Braces +18 added lines, -22 removed lines

@@ -72,17 +72,19 @@ 
 
         if ( is_null($method) ) {
 
-            if ( isset($this->hooks[$event]) ) array_push($this->hooks[$event], $callback);
-
-            else $this->hooks[$event] = Array($callback);
-
-        }
-
-        else {
+            if ( isset($this->hooks[$event]) ) {
+                array_push($this->hooks[$event], $callback);
+            } else {
+                $this->hooks[$event] = Array($callback);
+            }
 
-            if ( isset($this->hooks[$event]) ) array_push($this->hooks[$event], Array($callback, $method));
+        } else {
 
-            else $this->hooks[$event] = Array(Array($callback, $method));
+            if ( isset($this->hooks[$event]) ) {
+                array_push($this->hooks[$event], Array($callback, $method));
+            } else {
+                $this->hooks[$event] = Array(Array($callback, $method));
+            }
 
         }
 
@@ -110,9 +112,7 @@ 
 
             return true;
 
-        }
-
-        else if ( isset($this->hooks[$event]) ) {
+        } else if ( isset($this->hooks[$event]) ) {
 
             foreach ($this->hooks[$event] as $key => $hook) {
 
@@ -126,8 +126,7 @@ 
 
                     }
 
-                }
-                else {
+                } else {
 
                     if ( $hook == $callback ) {
 
@@ -143,10 +142,10 @@ 
 
             return false;
 
+        } else {
+            return false;
         }
 
-        else return false;
-
     }
 
     /**
@@ -194,8 +193,7 @@ 
 
                         }
 
-                    }
-                    else {
+                    } else {
 
                         $this->logger->warning('Skipping not-callable hook', array(
                             'EVENT'    => $event,
@@ -207,8 +205,7 @@ 
 
                     }
 
-                }
-                else {
+                } else {
 
                     if ( is_callable($callback) ) {
 
@@ -229,8 +226,7 @@ 
 
                         }
 
-                    }
-                    else {
+                    } else {
 
                         $this->logger->warning('Skipping not-callable hook', array(
                             'EVENT'    => $event,

src/Header.php

Doc Comments +5 added lines, -5 removed lines

@@ -57,8 +57,8 @@ 
      * Set $header with a $value. If value is null, only $header will be used
      *
      * @param   string  $header   Header name
-     * @param   mixed   $value    Header value (if not included in $header)
-     * @return  Object  $this
+     * @param   string   $value    Header value (if not included in $header)
+     * @return  Header  $this
      */
     final public function set($header, $value=null) {
 
@@ -86,7 +86,7 @@ 
     /**
      * Free recorded headers (re-init array)
      *
-     * @return  Object  $this
+     * @return  Header  $this
      */
     final public function free() {
 
@@ -231,7 +231,7 @@ 
      * Shortcut to set client cache headers
      *
      * @param   integer     $ttl    Cache time to live
-     * @return  Object      $this
+     * @return  Header      $this
      */
     public function setClientCache($ttl) {
 
@@ -255,7 +255,7 @@ 
      *
      * @param   string      $type       Content type
      * @param   string      $charset    Charset
-     * @return  Object      $this
+     * @return  Header      $this
      */
     public function setContentType($type, $charset=null) {
 

Spacing +20 added lines, -20 removed lines

@@ -47,7 +47,7 @@ 
      *
      * @param   string  $time   Dispatcher time
      */
-    final public function __construct($time=false) {
+    final public function __construct($time = false) {
 
         $this->current_time = $time !== false ? $time : microtime(true);
 
@@ -60,7 +60,7 @@ 
      * @param   mixed   $value    Header value (if not included in $header)
      * @return  Object  $this
      */
-    final public function set($header, $value=null) {
+    final public function set($header, $value = null) {
 
         $this->headers[$header] = $value;
 
@@ -77,7 +77,7 @@ 
      */
     final public function get($header) {
 
-        if ( array_key_exists($header, $this->headers) ) return $this->headers[$header];
+        if (array_key_exists($header, $this->headers)) return $this->headers[$header];
 
         else return null;
 
@@ -113,7 +113,7 @@ 
      * @param   integer     $contentLength  Content length
      * @param   string      $value          (optional) value (see method description)
      */
-    final public function compose($status, $contentLength=0, $value=false) {
+    final public function compose($status, $contentLength = 0, $value = false) {
 
         switch ($status) {
 
@@ -145,7 +145,7 @@ 
 
             header($_SERVER["SERVER_PROTOCOL"].' 204 No Content');
             header('Status: 204 No Content');
-            header('Content-Length: 0',true);
+            header('Content-Length: 0', true);
 
             $this->processExtraHeaders($this->headers);
             
@@ -157,13 +157,13 @@ 
             case 303: //See Other
             case 307: //Temporary Redirect
 
-            header("Location: ".$value,true,$status);
+            header("Location: ".$value, true, $status);
             
             break;
 
             case 304: //Not Modified
 
-            if ( $value === false ) header($_SERVER["SERVER_PROTOCOL"].' 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 ($contentLength !== 0) header('Content-Length: '.$contentLength); //is it needed?
@@ -197,7 +197,7 @@ 
 
             case 405: //Not allowed
 
-            header('Allow: ' . $value, true, 405); 
+            header('Allow: '.$value, true, 405); 
 
             break;
 
@@ -209,7 +209,7 @@ 
 
             case 501: //Not implemented
 
-            header('Allow: ' . $value, true, 501);
+            header('Allow: '.$value, true, 501);
             
             break;
 
@@ -217,7 +217,7 @@ 
 
             header('HTTP/1.1 503 Service Temporarily Unavailable');
             header('Status: 503 Service Temporarily Unavailable');
-            if ( $value !== false AND @is_int($value) ) {
+            if ($value !== false AND @is_int($value)) {
                 header('Retry-After: '.$value);
             }
             
@@ -237,13 +237,13 @@ 
 
         $ttl = filter_var($ttl, FILTER_VALIDATE_INT);
 
-        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");
+        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 {
-            $this->set("Cache-Control","no-cache, must-revalidate");
-            $this->set("Expires","Mon, 26 Jul 1997 05:00:00 GMT");
+            $this->set("Cache-Control", "no-cache, must-revalidate");
+            $this->set("Expires", "Mon, 26 Jul 1997 05:00:00 GMT");
         }
 
         return $this;
@@ -257,11 +257,11 @@ 
      * @param   string      $charset    Charset
      * @return  Object      $this
      */
-    public function setContentType($type, $charset=null) {
+    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;
 
@@ -298,9 +298,9 @@ 
      */
     private function processExtraHeaders($headers) {
 
-        foreach ( $headers as $header => $value ) {
+        foreach ($headers as $header => $value) {
 
-            if ( is_null($value) ) header($header, true);
+            if (is_null($value)) header($header, true);
             else  header($header.": ".$value, true);
 
         }

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/ObjectRoute/ObjectRoute.php

Doc Comments +7 added lines, -7 removed lines

@@ -60,7 +60,7 @@ 
      *
      * @param   string  $service    The service name
      *
-     * @return  Object  $this
+     * @return  ObjectRoute  $this
      */
     public function setService($service) {
 
@@ -85,7 +85,7 @@ 
      *
      * @param   string  $type
      *
-     * @return  Object  $this
+     * @return  ObjectRoute  $this
      */
     public function setType($type) {
 
@@ -113,7 +113,7 @@ 
      *
      * @param   string  $target
      *
-     * @return  Object  $this
+     * @return  ObjectRoute  $this
      */
     public function setTarget($target) {
 
@@ -239,7 +239,7 @@ 
      * @param   string  $header     Header name
      * @param   string  $value      Header content (optional)
      *
-     * @return  ObjectRequest   $this
+     * @return  ObjectRoute   $this
      */
     public function setHeader($header, $value=null) {
 
@@ -290,7 +290,7 @@ 
      *
      * @param   array   $headers    Headers array
      *
-     * @return  ObjectRequest   $this
+     * @return  ObjectRoute   $this
      */
     public function setHeaders($headers) {
 
@@ -303,7 +303,7 @@ 
     /**
      * Unset headers
      *
-     * @return  ObjectRequest   $this
+     * @return  ObjectRoute   $this
      */
     public function unsetHeaders() {
 
@@ -327,7 +327,7 @@ 
     /**
      * Set extra parameter
      *
-     * @return  ObjectRequest   $this
+     * @return  ObjectRoute   $this
      */
     public function setParameter($parameter, $value=null) {
 

Spacing +9 added lines, -9 removed lines

@@ -47,13 +47,13 @@ 
 
     private $parameters = array();
 
-    private $supported_route_types = array("ROUTE","REDIRECT","ERROR");
+    private $supported_route_types = array("ROUTE", "REDIRECT", "ERROR");
 
-    private $supported_redirect_codes = array(201,301,302,303,307);
+    private $supported_redirect_codes = array(201, 301, 302, 303, 307);
 
-    private $supported_error_codes = array(400,403,404,405,500,501,503);
+    private $supported_error_codes = array(400, 403, 404, 405, 500, 501, 503);
 
-    private $supported_cache_modes = array("SERVER","CLIENT","BOTH");
+    private $supported_cache_modes = array("SERVER", "CLIENT", "BOTH");
 
     /**
      * Set service name
@@ -241,7 +241,7 @@ 
      *
      * @return  ObjectRequest   $this
      */
-    public function setHeader($header, $value=null) {
+    public function setHeader($header, $value = null) {
 
         $this->headers[$header] = $value;
 
@@ -258,7 +258,7 @@ 
      */
     public function unsetHeader($header) {
 
-        if ( isset($this->headers[$header]) ) {
+        if (isset($this->headers[$header])) {
 
             unset($this->headers[$header]);
 
@@ -279,7 +279,7 @@ 
      */
     public function getHeader($header) {
 
-        if ( isset($this->headers[$header]) ) return $this->headers[$header];
+        if (isset($this->headers[$header])) return $this->headers[$header];
 
         return null;
 
@@ -329,7 +329,7 @@ 
      *
      * @return  ObjectRequest   $this
      */
-    public function setParameter($parameter, $value=null) {
+    public function setParameter($parameter, $value = null) {
 
         $this->parameters[$parameter] = $value;
 
@@ -344,7 +344,7 @@ 
      */
     public function getParameter($parameter) {
 
-        if ( isset($this->parameters[$parameter]) ) return $this->parameters[$parameter];
+        if (isset($this->parameters[$parameter])) return $this->parameters[$parameter];
 
         else return null;
 

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/Service/Service.php

Doc Comments +11 added lines, -11 removed lines

@@ -260,7 +260,7 @@ 
      * @param   array   $attributes array og attributes that service expects
      * @param   array   $parameters array of parameters that service expects
      *
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function expects($method, $attributes, $parameters=array()) {
 
@@ -280,7 +280,7 @@ 
      * @param   array   $attributes array og attributes that service likes
      * @param   array   $parameters array of parameters that service likes
      *
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function likes($method, $attributes, $parameters=array()) {
 
@@ -306,7 +306,7 @@ 
      *
      * @param   string  $methods     HTTP methods, comma separated
      *
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function setSupportedMethods($methods) {
 
@@ -331,7 +331,7 @@ 
      * Set service content type
      *
      * @param   string  $type   Content Type
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function setContentType($type) {
 
@@ -357,7 +357,7 @@ 
      *
      * @param   string  $charset   Charset
      *
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function setCharset($charset) {
 
@@ -382,7 +382,7 @@ 
      * Set success status code
      *
      * @param   integer $code   HTTP status code (in case of success)
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function setStatusCode($code) {
 
@@ -433,7 +433,7 @@ 
      * @param   string  $header     Header name
      * @param   string  $value      Header content (optional)
      *
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function setHeader($header, $value=null) {
 
@@ -484,7 +484,7 @@ 
      *
      * @param   array   $headers    Headers array
      *
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function setHeaders($headers) {
 
@@ -497,7 +497,7 @@ 
     /**
      * Unset headers
      *
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function unsetHeaders() {
 
@@ -521,7 +521,7 @@ 
     /**
      * Get service-supported HTTP methods
      *
-     * @return  array   Headers array
+     * @return  string   Headers array
      */
     final public function getSupportedMethods() {
 
@@ -555,7 +555,7 @@ 
     /**
      * Return the callable class method that reflect the requested one
      *
-     * @return  array   Headers array
+     * @return  string   Headers array
      */
     final public function getCallableMethod($method) {
 

Spacing +19 added lines, -19 removed lines

@@ -177,7 +177,7 @@ 
      *
      * @var     array
      */
-    private $supported_success_codes = array(200,202,204);
+    private $supported_success_codes = array(200, 202, 204);
 
     /*************** HTTP METHODS IMPLEMENTATIONS **************/
 
@@ -262,7 +262,7 @@ 
      *
      * @return  Object  $this
      */
-    final public function expects($method, $attributes, $parameters=array()) {
+    final public function expects($method, $attributes, $parameters = array()) {
 
         $method = strtoupper($method);
 
@@ -282,7 +282,7 @@ 
      *
      * @return  Object  $this
      */
-    final public function likes($method, $attributes, $parameters=array()) {
+    final public function likes($method, $attributes, $parameters = array()) {
 
         $method = strtoupper($method);
 
@@ -435,7 +435,7 @@ 
      *
      * @return  Object  $this
      */
-    final public function setHeader($header, $value=null) {
+    final public function setHeader($header, $value = null) {
 
         $this->headers[$header] = $value;
 
@@ -452,7 +452,7 @@ 
      */
     final public function unsetHeader($header) {
 
-        if ( isset($this->headers[$header]) ) {
+        if (isset($this->headers[$header])) {
 
             unset($this->headers[$header]);
 
@@ -473,7 +473,7 @@ 
      */
     final public function getHeader($header) {
 
-        if ( isset($this->headers[$header]) ) return $this->headers[$header];
+        if (isset($this->headers[$header])) return $this->headers[$header];
 
         return null;
 
@@ -536,15 +536,15 @@ 
      */
     final public function getImplementedMethods() {
 
-        if ( method_exists($this, 'any') ) return explode(",",$this->supported_http_methods);
+        if (method_exists($this, 'any')) return explode(",", $this->supported_http_methods);
 
-        $supported_methods = explode(',',$this->supported_http_methods);
+        $supported_methods = explode(',', $this->supported_http_methods);
 
         $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);
 
         }
 
@@ -559,7 +559,7 @@ 
      */
     final public function getCallableMethod($method) {
 
-        if ( method_exists($this, strtolower($method)) ) return strtolower($method);
+        if (method_exists($this, strtolower($method))) return strtolower($method);
 
         else return "any";
 
@@ -576,9 +576,9 @@ 
 
         return array(
 
-            ( sizeof($this->expected_attributes[$method]) == 0 AND sizeof($this->expected_attributes["ANY"]) != 0 ) ? $this->expected_attributes["ANY"] : $this->expected_attributes[$method],
+            (sizeof($this->expected_attributes[$method]) == 0 AND sizeof($this->expected_attributes["ANY"]) != 0) ? $this->expected_attributes["ANY"] : $this->expected_attributes[$method],
 
-            ( sizeof($this->expected_parameters[$method]) == 0 AND sizeof($this->expected_parameters["ANY"]) != 0 ) ? $this->expected_parameters["ANY"] : $this->expected_parameters[$method]
+            (sizeof($this->expected_parameters[$method]) == 0 AND sizeof($this->expected_parameters["ANY"]) != 0) ? $this->expected_parameters["ANY"] : $this->expected_parameters[$method]
 
         );
 
@@ -595,9 +595,9 @@ 
 
         return array(
 
-            ( sizeof($this->liked_attributes[$method]) == 0 AND sizeof($this->liked_attributes["ANY"]) != 0 ) ? $this->liked_attributes["ANY"] : $this->liked_attributes[$method],
+            (sizeof($this->liked_attributes[$method]) == 0 AND sizeof($this->liked_attributes["ANY"]) != 0) ? $this->liked_attributes["ANY"] : $this->liked_attributes[$method],
 
-            ( sizeof($this->liked_parameters[$method]) == 0 AND sizeof($this->liked_parameters["ANY"]) != 0 ) ? $this->liked_parameters["ANY"] : $this->liked_parameters[$method]
+            (sizeof($this->liked_parameters[$method]) == 0 AND sizeof($this->liked_parameters["ANY"]) != 0) ? $this->liked_parameters["ANY"] : $this->liked_parameters[$method]
 
             );
 
@@ -633,7 +633,7 @@ 
      */
     final public function getAttribute($attribute) {
 
-        if ( isset($this->attributes[$attribute]) ) return $this->attributes[$attribute];
+        if (isset($this->attributes[$attribute])) return $this->attributes[$attribute];
 
         return null;
 
@@ -664,7 +664,7 @@ 
      *
      * @return  array
      */
-    final public function getParameters($raw=false) {
+    final public function getParameters($raw = false) {
 
         return $raw ? $this->raw_parameters : $this->parameters;
 
@@ -679,7 +679,7 @@ 
      */
     final public function getParameter($parameter) {
 
-        if ( isset($this->parameters[$parameter]) ) return $this->parameters[$parameter];
+        if (isset($this->parameters[$parameter])) return $this->parameters[$parameter];
 
         return null;
 
@@ -704,7 +704,7 @@ 
      */
     final public function getRequestHeader($header) {
 
-        if ( isset($this->request_headers[$header]) ) return $this->request_headers[$header];
+        if (isset($this->request_headers[$header])) return $this->request_headers[$header];
 
         return null;
 

Braces +23 added lines, -9 removed lines

@@ -473,7 +473,9 @@ 
      */
     final public function getHeader($header) {
 
-        if ( isset($this->headers[$header]) ) return $this->headers[$header];
+        if ( isset($this->headers[$header]) ) {
+            return $this->headers[$header];
+        }
 
         return null;
 
@@ -536,7 +538,9 @@ 
      */
     final public function getImplementedMethods() {
 
-        if ( method_exists($this, 'any') ) return explode(",",$this->supported_http_methods);
+        if ( method_exists($this, 'any') ) {
+            return explode(",",$this->supported_http_methods);
+        }
 
         $supported_methods = explode(',',$this->supported_http_methods);
 
@@ -544,7 +548,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);
+            }
 
         }
 
@@ -559,9 +565,11 @@ 
      */
     final public function getCallableMethod($method) {
 
-        if ( method_exists($this, strtolower($method)) ) return strtolower($method);
-
-        else return "any";
+        if ( method_exists($this, strtolower($method)) ) {
+            return strtolower($method);
+        } else {
+            return "any";
+        }
 
     }
 
@@ -633,7 +641,9 @@ 
      */
     final public function getAttribute($attribute) {
 
-        if ( isset($this->attributes[$attribute]) ) return $this->attributes[$attribute];
+        if ( isset($this->attributes[$attribute]) ) {
+            return $this->attributes[$attribute];
+        }
 
         return null;
 
@@ -679,7 +689,9 @@ 
      */
     final public function getParameter($parameter) {
 
-        if ( isset($this->parameters[$parameter]) ) return $this->parameters[$parameter];
+        if ( isset($this->parameters[$parameter]) ) {
+            return $this->parameters[$parameter];
+        }
 
         return null;
 
@@ -704,7 +716,9 @@ 
      */
     final public function getRequestHeader($header) {
 
-        if ( isset($this->request_headers[$header]) ) return $this->request_headers[$header];
+        if ( isset($this->request_headers[$header]) ) {
+            return $this->request_headers[$header];
+        }
 
         return null;
 

src/XML.php

Doc Comments +5 added lines, -4 removed lines

@@ -116,7 +116,7 @@ 
      * 
      * @param bool $bool
      *
-     * @return Object $this
+     * @return XML $this
      */
     final public function setIncludeHeader($bool) {
 
@@ -131,7 +131,7 @@ 
      * 
      * @param int $int
      *
-     * @return Object $this
+     * @return XML $this
      */
     final public function setCaseFolding($int) {
 
@@ -146,7 +146,7 @@ 
      * 
      * @param int $int
      *
-     * @return Object $this
+     * @return XML $this
      */
     final public function setSkipWhite($int) {
 
@@ -161,7 +161,7 @@ 
      * 
      * @param string $encoding
      *
-     * @return Object $this
+     * @return XML $this
      */
     final public function setEncoding($encoding) {
 
@@ -306,6 +306,7 @@ 
     /**
      * Get element childs (if any)
      *
+     * @param integer $i
      * @return array
      */
     private function getChilds(&$i) {

Spacing +19 added lines, -19 removed lines

@@ -202,7 +202,7 @@ 
      */
     public function encode(array $data) {
 
-        $structure = ($this->includeHeader ? $this->getHeader() : "") . $this->getParent();
+        $structure = ($this->includeHeader ? $this->getHeader() : "").$this->getParent();
         
         $this->ObjectXML = new SimpleXMLElement($structure);
         
@@ -210,7 +210,7 @@ 
         
         $xml = $this->ObjectXML->asXML();
 
-        if ( $xml === false ) throw new XMLException("Error formatting object");
+        if ($xml === false) throw new XMLException("Error formatting object");
         
         return $xml;
         
@@ -221,17 +221,17 @@ 
      * 
      * @return array    
      */
-    public function decode(string $xml, $encoding=null) {
+    public function decode(string $xml, $encoding = null) {
 
         $this->parser = is_null($encoding) ? xml_parser_create() : xml_parser_create($encoding);
 
-        xml_parser_set_option($this->parser,XML_OPTION_TARGET_ENCODING,$this->encoding);
-        xml_parser_set_option($this->parser,XML_OPTION_CASE_FOLDING,$this->caseFolding);
-        xml_parser_set_option($this->parser,XML_OPTION_SKIP_WHITE,$this->skipWhite);
+        xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, $this->encoding);
+        xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, $this->caseFolding);
+        xml_parser_set_option($this->parser, XML_OPTION_SKIP_WHITE, $this->skipWhite);
         
         $parser_structs = xml_parse_into_struct($this->parser, $xml, $this->struct, $index);
         
-        if ( $parser_structs === 0 ) throw new XMLException("Failed to parse xml data into structs");
+        if ($parser_structs === 0) throw new XMLException("Failed to parse xml data into structs");
         
         $this->counter = count($this->struct);
 
@@ -251,9 +251,9 @@ 
      */
     private function sanitizeKeys($input, $key) {
 
-        $key_value = explode("_",$this->struct[$key]["tag"]);
+        $key_value = explode("_", $this->struct[$key]["tag"]);
 
-        if ( sizeof($key_value) == 2 AND $key_value[0] == "KEY" AND is_numeric($key_value[1]) ) {
+        if (sizeof($key_value) == 2 AND $key_value[0] == "KEY" AND is_numeric($key_value[1])) {
 
             $this->struct[$key]["tag"] = intval($key_value[1]);
 
@@ -266,7 +266,7 @@ 
      */
     private function free() {
 
-        if( isset($this->parser) AND @is_resource($this->parser) ) {
+        if (isset($this->parser) AND @is_resource($this->parser)) {
 
             xml_parser_free($this->parser);
 
@@ -320,7 +320,7 @@ 
 
             $value = isset($this->struct[$i]["value"]) ? $this->struct[$i]["value"] : "";
 
-            switch($this->struct[$i]["type"]) {
+            switch ($this->struct[$i]["type"]) {
 
                 case "open":
                 $child = $this->getChilds($i);
@@ -348,13 +348,13 @@ 
      */
     private function addNode($target, $key, $attributes, $child, $value) {
         
-        if ( !isset($target[$key]) ) {
+        if (!isset($target[$key])) {
             
             if ($child != "") $target[$key] = $child;
 
-            if ($attributes != "") foreach($attributes as $akey => $avalue) $target[$key][$akey] = $avalue;
+            if ($attributes != "") foreach ($attributes as $akey => $avalue) $target[$key][$akey] = $avalue;
 
-            else if ( $value != "" ) $target[$key] = $value;
+            else if ($value != "") $target[$key] = $value;
             
         } else {
 
@@ -363,7 +363,7 @@ 
                 $oldval = $target[$key];
                 $target[$key] = array();
                 $target[$key][0] = $oldval;
-                $index=1;
+                $index = 1;
 
             }
             else {
@@ -372,11 +372,11 @@ 
 
             }
 
-            if ( $child != "" ) $target[$key][$index] = $child;
+            if ($child != "") $target[$key][$index] = $child;
 
-            if ( $attributes != "" ) foreach($attributes as $akey => $avalue) $target[$key][$index][$akey] = $avalue;
+            if ($attributes != "") foreach ($attributes as $akey => $avalue) $target[$key][$index][$akey] = $avalue;
 
-            elseif ( $value != "" ) $target[$key][$index] = $value;
+            elseif ($value != "") $target[$key][$index] = $value;
         }
 
         return $target;
@@ -393,7 +393,7 @@ 
 
         foreach ($data as $key => $value) {
 
-            if ( is_array($value) ) $this->pushElement($ObjectXML->addChild(is_numeric($key) ? 'KEY_'.$key : $key), $value);
+            if (is_array($value)) $this->pushElement($ObjectXML->addChild(is_numeric($key) ? 'KEY_'.$key : $key), $value);
 
             else $ObjectXML->addChild(is_numeric($key) ? 'KEY_'.$key : $key, mb_convert_encoding($value, $this->encoding));
 

Braces +28 added lines, -15 removed lines

@@ -210,7 +210,9 @@ 
         
         $xml = $this->ObjectXML->asXML();
 
-        if ( $xml === false ) throw new XMLException("Error formatting object");
+        if ( $xml === false ) {
+            throw new XMLException("Error formatting object");
+        }
         
         return $xml;
         
@@ -231,7 +233,9 @@ 
         
         $parser_structs = xml_parse_into_struct($this->parser, $xml, $this->struct, $index);
         
-        if ( $parser_structs === 0 ) throw new XMLException("Failed to parse xml data into structs");
+        if ( $parser_structs === 0 ) {
+            throw new XMLException("Failed to parse xml data into structs");
+        }
         
         $this->counter = count($this->struct);
 
@@ -350,11 +354,15 @@ 
         
         if ( !isset($target[$key]) ) {
             
-            if ($child != "") $target[$key] = $child;
-
-            if ($attributes != "") foreach($attributes as $akey => $avalue) $target[$key][$akey] = $avalue;
+            if ($child != "") {
+                $target[$key] = $child;
+            }
 
-            else if ( $value != "" ) $target[$key] = $value;
+            if ($attributes != "") {
+                foreach($attributes as $akey => $avalue) $target[$key][$akey] = $avalue;
+            } else if ( $value != "" ) {
+                $target[$key] = $value;
+            }
             
         } else {
 
@@ -365,18 +373,21 @@ 
                 $target[$key][0] = $oldval;
                 $index=1;
 
-            }
-            else {
+            } else {
 
                 $index = count($target[$key]);
 
             }
 
-            if ( $child != "" ) $target[$key][$index] = $child;
-
-            if ( $attributes != "" ) foreach($attributes as $akey => $avalue) $target[$key][$index][$akey] = $avalue;
+            if ( $child != "" ) {
+                $target[$key][$index] = $child;
+            }
 
-            elseif ( $value != "" ) $target[$key][$index] = $value;
+            if ( $attributes != "" ) {
+                foreach($attributes as $akey => $avalue) $target[$key][$index][$akey] = $avalue;
+            } elseif ( $value != "" ) {
+                $target[$key][$index] = $value;
+            }
         }
 
         return $target;
@@ -393,9 +404,11 @@ 
 
         foreach ($data as $key => $value) {
 
-            if ( is_array($value) ) $this->pushElement($ObjectXML->addChild(is_numeric($key) ? 'KEY_'.$key : $key), $value);
-
-            else $ObjectXML->addChild(is_numeric($key) ? 'KEY_'.$key : $key, mb_convert_encoding($value, $this->encoding));
+            if ( is_array($value) ) {
+                $this->pushElement($ObjectXML->addChild(is_numeric($key) ? 'KEY_'.$key : $key), $value);
+            } else {
+                $ObjectXML->addChild(is_numeric($key) ? 'KEY_'.$key : $key, mb_convert_encoding($value, $this->encoding));
+            }
 
         }
 

src/Serialization.php

Spacing +16 added lines, -16 removed lines

@@ -37,9 +37,9 @@ 
      *
      * @return  string  JSON encoded data
      */
-    final public function toJson($data, $flags=null) {
+    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);
 
@@ -55,11 +55,11 @@ 
      *
      * @return  string  XML encoded data
      */
-    final public function toXml($data, $prettify=false) {
+    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 +103,9 @@ 
      */
     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);
 
@@ -147,7 +147,7 @@ 
        
         $indent = '';
 
-        $xmlString = str_replace("\n","",$xmlString);
+        $xmlString = str_replace("\n", "", $xmlString);
         $xmlString = trim(preg_replace("/<\?[^>]+>/", "", $xmlString));
         $xmlString = preg_replace("/>([\s]+)<\//", "></", $xmlString);
         $xmlString = str_replace(">", ">\n", $xmlString);
@@ -156,23 +156,23 @@ 
 
         $_xmlString = '';
         
-        foreach($xmlStringArray as $k=>$tag){
+        foreach ($xmlStringArray as $k=>$tag) {
 
             if ($tag == "") continue;
             
-            if ($tag[0]=="<" AND $tag[1] != "/") {
+            if ($tag[0] == "<" AND $tag[1] != "/") {
 
                 $_xmlString .= $indent.$tag."\n";
                 $indent .= '  ';
 
-            } elseif($tag[0]=="<" AND $tag[1] == "/") {
+            } elseif ($tag[0] == "<" AND $tag[1] == "/") {
 
-                $indent = substr($indent,0,strlen($indent)-2);
-                $_xmlString .= (substr($_xmlString,strlen($_xmlString)-1)==">" || substr($_xmlString,strlen($_xmlString)-1)=="\n" ? $indent : '').$tag."\n";
+                $indent = substr($indent, 0, strlen($indent)-2);
+                $_xmlString .= (substr($_xmlString, strlen($_xmlString)-1) == ">" || substr($_xmlString, strlen($_xmlString)-1) == "\n" ? $indent : '').$tag."\n";
 
             } else {
 
-                $_xmlString = substr($_xmlString,0,strlen($_xmlString)-1);
+                $_xmlString = substr($_xmlString, 0, strlen($_xmlString)-1);
                 $_xmlString .= $tag;
 
             }
@@ -191,11 +191,11 @@ 
      */
     private function objectToArray($stdObj) {
        
-        if(is_object($stdObj)) {
+        if (is_object($stdObj)) {
 
             $array = array();
             
-            foreach($stdObj as $key=>$val){
+            foreach ($stdObj as $key=>$val) {
 
                 $array[$key] = objectToArray($val);
 

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/ObjectRoutingTable/ObjectRoutingTable.php

Spacing +12 added lines, -12 removed lines

@@ -48,7 +48,7 @@ 
      *
      * @var array
      */
-    private $supported_route_types = array("ROUTE","REDIRECT","ERROR");
+    private $supported_route_types = array("ROUTE", "REDIRECT", "ERROR");
 
     /**
      * Object constructor.
@@ -77,7 +77,7 @@ 
      *
      * @return  Object  $this
      */
-    public function setRoute($service, $type, $target, $parameters=array()) {
+    public function setRoute($service, $type, $target, $parameters = array()) {
 
         $this->table[$service] = array(
             "type"          =>  $type,
@@ -98,7 +98,7 @@ 
      */
     public function unsetRoute($service) {
 
-        if ( isset($this->table[$service]) ) {
+        if (isset($this->table[$service])) {
 
             unset($this->table[$service]);
 
@@ -121,17 +121,17 @@ 
 
         // 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
         // If false, return a 500 error
 
-        if ( isset($this->table[$service]) ) {
+        if (isset($this->table[$service])) {
 
-            if ( $this->table[$service]["type"] == "ROUTE" ) {
+            if ($this->table[$service]["type"] == "ROUTE") {
 
-                if ( $this->routable($this->table[$service]["target"]) ) return $this->table[$service];
+                if ($this->routable($this->table[$service]["target"])) return $this->table[$service];
 
                 else return $this->routeToNowhere();
 
@@ -144,7 +144,7 @@ 
         // If autoroute is enabled, try to match service name with a service file.
         // If true, try to route request
 
-        else if ( defined('DISPATCHER_AUTO_ROUTE') && DISPATCHER_AUTO_ROUTE === true AND $this->routable($service.".php", true) ) {
+        else if (defined('DISPATCHER_AUTO_ROUTE') && DISPATCHER_AUTO_ROUTE === true AND $this->routable($service.".php", true)) {
 
             return array(
                 "type"          =>  "ROUTE",
@@ -178,9 +178,9 @@ 
      *
      * @return  bool
      */
-    private function routable($target, $relative=false) {
+    private function routable($target, $relative = false) {
 
-        if ( $relative ) return is_readable(DISPATCHER_SERVICES_FOLDER.$target) ? true : false;
+        if ($relative) return is_readable(DISPATCHER_SERVICES_FOLDER.$target) ? true : false;
 
         else return is_readable($target) ? true : false;
 
@@ -193,7 +193,7 @@ 
      */
     private function routeToLanding() {
 
-        if ( isset($this->table[""]) ) {
+        if (isset($this->table[""])) {
 
             return $this->table[""];
 
@@ -210,7 +210,7 @@ 
      */
     private function routeToDefault() {
 
-        if ( isset($this->table["default"]) ) {
+        if (isset($this->table["default"])) {
 
             return $this->table["default"];
 

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();
-
     }
 
     /**