comodojo / dispatcher.framework

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

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,

Doc Comments +1 added lines, -1 removed lines

@@ -66,7 +66,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) {
 

src/Components/Configuration.php

Indentation +37 added lines, -37 removed lines

@@ -22,43 +22,43 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
- // define('DISPATCHER_LOG_ENABLED', false);
- //
- // define('DISPATCHER_LOG_NAME', 'dispatcher');
- //
- // define('DISPATCHER_LOG_TARGET', null);
- //
- // define('DISPATCHER_LOG_LEVEL', 'ERROR');
- //
- // define("DISPATCHER_REAL_PATH", realpath(dirname(__FILE__)."/../")."/");
- //
- // define("DISPATCHER_BASEURL","");
- //
- // define ('DISPATCHER_ENABLED', true);
- //
- // define ('DISPATCHER_USE_REWRITE', true);
- //
- // define('DISPATCHER_AUTO_ROUTE', false);
- //
- // define('DISPATCHER_CACHE_ENABLED', true);
- //
- // define('DISPATCHER_CACHE_DEFAULT_TTL', 600);
- //
- // define('DISPATCHER_CACHE_FAIL_SILENTLY', true);
- //
- // define('DISPATCHER_DEFAULT_ENCODING', 'UTF-8');
- //
- // define('DISPATCHER_SUPPORTED_METHODS', 'GET,PUT,POST,DELETE,OPTIONS,HEAD');
- //
- // define('DISPATCHER_CACHE_FOLDER', DISPATCHER_REAL_PATH."cache/");
- //
- // define('DISPATCHER_SERVICES_FOLDER', DISPATCHER_REAL_PATH."services/");
- //
- // define('DISPATCHER_PLUGINS_FOLDER', DISPATCHER_REAL_PATH."plugins/");
- //
- // define('DISPATCHER_TEMPLATES_FOLDER', DISPATCHER_REAL_PATH."templates/");
- //
- // define('DISPATCHER_LOG_FOLDER', DISPATCHER_REAL_PATH."logs/");
+    // define('DISPATCHER_LOG_ENABLED', false);
+    //
+    // define('DISPATCHER_LOG_NAME', 'dispatcher');
+    //
+    // define('DISPATCHER_LOG_TARGET', null);
+    //
+    // define('DISPATCHER_LOG_LEVEL', 'ERROR');
+    //
+    // define("DISPATCHER_REAL_PATH", realpath(dirname(__FILE__)."/../")."/");
+    //
+    // define("DISPATCHER_BASEURL","");
+    //
+    // define ('DISPATCHER_ENABLED', true);
+    //
+    // define ('DISPATCHER_USE_REWRITE', true);
+    //
+    // define('DISPATCHER_AUTO_ROUTE', false);
+    //
+    // define('DISPATCHER_CACHE_ENABLED', true);
+    //
+    // define('DISPATCHER_CACHE_DEFAULT_TTL', 600);
+    //
+    // define('DISPATCHER_CACHE_FAIL_SILENTLY', true);
+    //
+    // define('DISPATCHER_DEFAULT_ENCODING', 'UTF-8');
+    //
+    // define('DISPATCHER_SUPPORTED_METHODS', 'GET,PUT,POST,DELETE,OPTIONS,HEAD');
+    //
+    // define('DISPATCHER_CACHE_FOLDER', DISPATCHER_REAL_PATH."cache/");
+    //
+    // define('DISPATCHER_SERVICES_FOLDER', DISPATCHER_REAL_PATH."services/");
+    //
+    // define('DISPATCHER_PLUGINS_FOLDER', DISPATCHER_REAL_PATH."plugins/");
+    //
+    // define('DISPATCHER_TEMPLATES_FOLDER', DISPATCHER_REAL_PATH."templates/");
+    //
+    // define('DISPATCHER_LOG_FOLDER', DISPATCHER_REAL_PATH."logs/");
 
 class Configuration {
 

Spacing +4 added lines, -4 removed lines

@@ -75,11 +75,11 @@ 
 
         $constants = get_defined_constants(true);
 
-        if ( !isset($constants['user']) ) return;
+        if (!isset($constants['user'])) return;
 
         $dispatcher_constants = preg_grep("/^DISPATCHER_/", array_keys($constants['user']));
 
-        if ( sizeof($dispatcher_constants) > 0 ) {
+        if (sizeof($dispatcher_constants) > 0) {
 
             $filtered_constants = array_intersect_key($constants['user'], array_flip($dispatcher_constants));
 
@@ -109,11 +109,11 @@ 
 
     private static function urlGetAbsolute() {
 
-        $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '') . '://';
+        $http = 'http'.((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '').'://';
 
         $uri = preg_replace("/\/index.php(.*?)$/i", "", $_SERVER['PHP_SELF']);
 
-        return ( $http . $_SERVER['HTTP_HOST'] . $uri . "/" );
+        return ($http.$_SERVER['HTTP_HOST'].$uri."/");
 
     }
 

Braces +3 added lines, -1 removed lines

@@ -75,7 +75,9 @@
 
         $constants = get_defined_constants(true);
 
-        if ( !isset($constants['user']) ) return;
+        if ( !isset($constants['user']) ) {
+            return;
+        }
 
         $dispatcher_constants = preg_grep("/^DISPATCHER_/", array_keys($constants['user']));
 

src/Components/Headers.php

Spacing +6 added lines, -6 removed lines

@@ -28,17 +28,17 @@ 
 
     final public function get($header = null) {
 
-        if ( is_null($header) ) return $this->headers;
+        if (is_null($header)) return $this->headers;
 
-        else if ( array_key_exists($header, $this->headers) ) return $this->headers[$header];
+        else if (array_key_exists($header, $this->headers)) return $this->headers[$header];
 
         else return null;
 
     }
 
-    final public function set($header, $value=null) {
+    final public function set($header, $value = null) {
 
-        if ( is_null($value) ) {
+        if (is_null($value)) {
 
             $header = explode(":", $header);
 
@@ -56,13 +56,13 @@ 
 
     final public function unset($header = null) {
 
-        if ( is_null($header) ) {
+        if (is_null($header)) {
 
             $this->headers = array();
 
             return true;
 
-        } else if ( array_key_exists($header, $this->headers) ) {
+        } else if (array_key_exists($header, $this->headers)) {
 
             unset($this->headers[$header]);
 

Braces +7 added lines, -5 removed lines

@@ -28,11 +28,13 @@
 
     final public function get($header = null) {
 
-        if ( is_null($header) ) return $this->headers;
-
-        else if ( array_key_exists($header, $this->headers) ) return $this->headers[$header];
-
-        else return null;
+        if ( is_null($header) ) {
+            return $this->headers;
+        } else if ( array_key_exists($header, $this->headers) ) {
+            return $this->headers[$header];
+        } else {
+            return null;
+        }
 
     }
 

src/Components/Parameters.php

Spacing +5 added lines, -5 removed lines

@@ -26,11 +26,11 @@ 
 
     protected $parameters = array();
 
-    final public function get($parameter=null) {
+    final public function get($parameter = null) {
 
-        if ( is_null($parameter) ) return $this->parameters;
+        if (is_null($parameter)) return $this->parameters;
 
-        else if ( array_key_exists($parameter, $this->parameters) ) {
+        else if (array_key_exists($parameter, $this->parameters)) {
 
             return $this->parameters[$parameter];
 
@@ -50,13 +50,13 @@ 
 
     final public function unset($parameter = null) {
 
-        if ( is_null($parameter) ) {
+        if (is_null($parameter)) {
 
             $this->parameters = array();
 
             return true;
 
-        } else if ( array_key_exists($parameter, $this->parameters) ) {
+        } else if (array_key_exists($parameter, $this->parameters)) {
 
             unset($this->parameters[$parameter]);
 

Braces +5 added lines, -5 removed lines

@@ -28,16 +28,16 @@
 
     final public function get($parameter=null) {
 
-        if ( is_null($parameter) ) return $this->parameters;
-
-        else if ( array_key_exists($parameter, $this->parameters) ) {
+        if ( is_null($parameter) ) {
+            return $this->parameters;
+        } else if ( array_key_exists($parameter, $this->parameters) ) {
 
             return $this->parameters[$parameter];
 
+        } else {
+            return null;
         }
 
-        else return null;
-
     }
 
     final public function set($parameter, $value) {

src/Output/Processor.php

Spacing +6 added lines, -6 removed lines

@@ -108,7 +108,7 @@ 
 
                 header($_SERVER["SERVER_PROTOCOL"].' 204 No Content');
                 header('Status: 204 No Content');
-                header('Content-Length: 0',true);
+                header('Content-Length: 0', true);
 
                 $return = null;
 
@@ -120,7 +120,7 @@ 
             case 303: //See Other
             case 307: //Temporary Redirect
 
-                header("Location: ".$location->get(),true,$status);
+                header("Location: ".$location->get(), true, $status);
 
                 break;
 
@@ -128,11 +128,11 @@ 
 
                 $last_modified = $headers->get('Last-Modified');
 
-                if ( is_null($last_modified) ) {
+                if (is_null($last_modified)) {
 
                     header($_SERVER["SERVER_PROTOCOL"].' 304 Not Modified');
 
-                } else if ( is_int($last_modified) ) {
+                } else if (is_int($last_modified)) {
 
                     header('Last-Modified: '.gmdate('D, d M Y H:i:s', $last_modified).' GMT', true, 304);
 
@@ -170,7 +170,7 @@ 
 
             case 405: //Not allowed
 
-            header('Allow: ' . $value, true, 405);
+            header('Allow: '.$value, true, 405);
 
             break;
 
@@ -183,7 +183,7 @@ 
 
             case 501: //Not implemented
 
-            header('Allow: ' . $value, true, 501);
+            header('Allow: '.$value, true, 501);
 
             break;
 

src/Request/Headers.php

Spacing +3 added lines, -3 removed lines

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

Braces +3 added lines, -1 removed lines

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