comodojo / dispatcher.framework

src/ObjectResult/ObjectError.php

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
 
     private $code = 500;
 
-    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 $content = null;
 
@@ -137,7 +137,7 @@ 
      *
      * @return  ObjectRequest   $this
      */
-    public function setHeader($header, $value=null) {
+    public function setHeader($header, $value = null) {
 
         $this->headers[$header] = $value;
 
@@ -154,7 +154,7 @@ 
      */
     public function unsetHeader($header) {
 
-        if ( isset($this->headers[$header]) ) {
+        if (isset($this->headers[$header])) {
 
             unset($this->headers[$header]);
 
@@ -175,7 +175,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;
 

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;
 

src/Debug.php

Spacing +3 added lines, -3 removed lines

@@ -38,15 +38,15 @@
 
         $name = defined('DISPATCHER_LOG_NAME') ? DISPATCHER_LOG_NAME : 'dispatcher-default';
 
-        $level = $this->getLevel( defined('DISPATCHER_LOG_LEVEL') ? DISPATCHER_LOG_LEVEL : 'DEBUG' );
+        $level = $this->getLevel(defined('DISPATCHER_LOG_LEVEL') ? DISPATCHER_LOG_LEVEL : 'DEBUG');
 
         $target = defined('DISPATCHER_LOG_TARGET') ? DISPATCHER_LOG_TARGET : null;
 
         $this->logger = new Logger($name);
 
-        if ( $enabled ) {
+        if ($enabled) {
 
-            $handler = is_null($target) ? new ErrorLogHandler() : new StreamHandler( defined('DISPATCHER_LOG_FOLDER') ? DISPATCHER_LOG_FOLDER.$target : $target, $level);
+            $handler = is_null($target) ? new ErrorLogHandler() : new StreamHandler(defined('DISPATCHER_LOG_FOLDER') ? DISPATCHER_LOG_FOLDER.$target : $target, $level);
 
         }
         else {

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
 
             $handler = is_null($target) ? new ErrorLogHandler() : new StreamHandler( defined('DISPATCHER_LOG_FOLDER') ? DISPATCHER_LOG_FOLDER.$target : $target, $level);
 
-        }
-        else {
+        } else {
 
             $handler = new NullHandler($level);
 

src/XML.php

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));
+            }
 
         }
 

Doc Comments +6 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) {
 
@@ -219,6 +219,7 @@ 
     /**
      * encode XML string into array
      *
+     * @param string $xml
      * @return array
      */
     public function decode($xml, $encoding=null) {
@@ -306,6 +307,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($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($xml, $encoding=null) {
+    public function decode($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));
 

src/Deserialization.php

Spacing +5 added lines, -5 removed lines

@@ -38,9 +38,9 @@ 
      *
      * @return  array
      */
-    final public function fromJson($data, $raw=false) {
+    final public function fromJson($data, $raw = false) {
 
-        if ( !is_string($data) ) throw new Exception("Invalid data for JSON deserialization");
+        if (!is_string($data)) throw new Exception("Invalid data for JSON deserialization");
 
         return json_decode($data, !$raw);
 
@@ -55,7 +55,7 @@ 
      */
     final public function fromXml($data) {
 
-        if ( !is_string($data) ) throw new Exception("Invalid data for XML deserialization");
+        if (!is_string($data)) throw new Exception("Invalid data for XML deserialization");
 
         $xmlEngine = new XML();
 
@@ -72,7 +72,7 @@ 
      */
     final public function fromYaml($data) {
 
-        if ( !is_string($data) ) throw new Exception("Invalid data for YAML deserialization");
+        if (!is_string($data)) throw new Exception("Invalid data for YAML deserialization");
 
         return \Spyc::YAMLLoadString($data);
 
@@ -87,7 +87,7 @@ 
      */
     final public function fromExport($data) {
 
-        if ( !is_string($data) ) throw new Exception("Invalid data for EXPORT deserialization");
+        if (!is_string($data)) throw new Exception("Invalid data for EXPORT deserialization");
 
         return unserialize($data);
 

Braces +12 added lines, -4 removed lines

@@ -40,7 +40,9 @@ 
      */
     final public function fromJson($data, $raw=false) {
 
-        if ( !is_string($data) ) throw new Exception("Invalid data for JSON deserialization");
+        if ( !is_string($data) ) {
+            throw new Exception("Invalid data for JSON deserialization");
+        }
 
         return json_decode($data, !$raw);
 
@@ -55,7 +57,9 @@ 
      */
     final public function fromXml($data) {
 
-        if ( !is_string($data) ) throw new Exception("Invalid data for XML deserialization");
+        if ( !is_string($data) ) {
+            throw new Exception("Invalid data for XML deserialization");
+        }
 
         $xmlEngine = new XML();
 
@@ -72,7 +76,9 @@ 
      */
     final public function fromYaml($data) {
 
-        if ( !is_string($data) ) throw new Exception("Invalid data for YAML deserialization");
+        if ( !is_string($data) ) {
+            throw new Exception("Invalid data for YAML deserialization");
+        }
 
         return \Spyc::YAMLLoadString($data);
 
@@ -87,7 +93,9 @@ 
      */
     final public function fromExport($data) {
 
-        if ( !is_string($data) ) throw new Exception("Invalid data for EXPORT deserialization");
+        if ( !is_string($data) ) {
+            throw new Exception("Invalid data for EXPORT deserialization");
+        }
 
         return unserialize($data);
 

src/Dispatcher.php

Braces +82 added lines, -49 removed lines

@@ -193,7 +193,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
 
@@ -228,22 +230,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
@@ -391,19 +395,25 @@ 
 
         $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
 
@@ -430,7 +440,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
 
@@ -471,7 +483,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"]) ) {
@@ -490,15 +504,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
 
@@ -625,7 +645,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);
@@ -638,16 +660,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;
 
@@ -657,8 +677,7 @@ 
                 unset($service_matrix["service"]);
                 $service_attributes = $service_matrix;
 
-            }
-            else {
+            } else {
 
                 $service_requested = "";
                 $service_attributes = array();
@@ -702,9 +721,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'];
 
@@ -759,7 +778,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();
 
@@ -767,15 +788,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 ) {
 
@@ -801,13 +820,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 ) {
 
@@ -837,7 +854,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);
+            }
 
         }
 
@@ -877,13 +896,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;
 
@@ -1010,13 +1033,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"
@@ -1024,13 +1051,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
@@ -1052,7 +1083,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());
 

Doc Comments +6 added lines, -3 removed lines

@@ -375,7 +375,7 @@ 
     /**
      * Dispatcher working method
      *
-     * @return  mixed
+     * @return  string
      */
     final public function dispatch() {
 
@@ -696,7 +696,7 @@ 
     /**
      * Return dispatcher baseurl, no matter the request
      *
-     * @return uri  The baseurl
+     * @return string  The baseurl
      */
     private function urlGetAbsolute($service=null) {
 
@@ -845,6 +845,9 @@ 
 
     }
 
+    /**
+     * @return ObjectResultInterface
+     */
     private function runService(ObjectRequest $request, ObjectRoute $route) {
 
         $method = $request->getMethod();
@@ -977,7 +980,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) {

Spacing +72 added lines, -72 removed lines

@@ -181,19 +181,19 @@ 
 
         // 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);
 
-        $this->logger->debug('Provided attributes',$request_attributes);
+        $this->logger->debug('Provided attributes', $request_attributes);
 
-        $this->logger->debug('Provided parameters',$request_parameters);
+        $this->logger->debug('Provided parameters', $request_parameters);
 
         $request_headers = $this->header->getRequestHeaders();
 
         // 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
 
@@ -222,21 +222,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);
 
@@ -247,7 +247,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));
 
         }
 
@@ -269,7 +269,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));
 
         }
 
@@ -282,7 +282,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 {
 
@@ -291,11 +291,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
-            ) );
+            ));
 
         }
 
@@ -307,7 +307,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 {
 
@@ -316,10 +316,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
-            ) );
+            ));
 
         }
 
@@ -331,7 +331,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";
 
@@ -368,7 +368,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);
 
     }
 
@@ -391,19 +391,19 @@ 
 
         $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
 
@@ -411,7 +411,7 @@ 
 
         // Check if dispatcher is enabled
 
-        if ( $this->enabled == false ) {
+        if ($this->enabled == false) {
 
             $route = new ObjectError();
             $route->setStatusCode(503);
@@ -430,7 +430,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
 
@@ -447,34 +447,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"]);
         }
@@ -490,15 +490,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
 
@@ -508,11 +508,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");
@@ -539,7 +539,7 @@ 
             'REDIRECTCODE'  => $this->serviceroute->getRedirectCode()
         ));
 
-        switch($this->serviceroute->getType()) {
+        switch ($this->serviceroute->getType()) {
 
             case "ERROR":
 
@@ -624,7 +624,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]);
             }
 
@@ -698,21 +698,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."/");
 
     }
 
@@ -736,7 +736,7 @@ 
 
         $parameters = array();
 
-        switch($method) {
+        switch ($method) {
 
             case 'POST':
 
@@ -759,7 +759,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();
 
@@ -767,9 +767,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);
 
@@ -777,7 +777,7 @@ 
 
         else {
 
-            if ( $esize == 0 ) {
+            if ($esize == 0) {
 
                 $e_attributes = array();
 
@@ -797,19 +797,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;
 
@@ -837,7 +837,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);
 
         }
 
@@ -855,11 +855,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"];
@@ -877,13 +877,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;
 
@@ -903,7 +903,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);
 
@@ -911,9 +911,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);
 
         }
 
@@ -956,7 +956,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());
 
@@ -986,15 +986,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";
 
@@ -1010,13 +1010,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"
@@ -1024,13 +1024,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
@@ -1039,10 +1039,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);
@@ -1052,7 +1052,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());