comodojo / dispatcher.framework

src/ObjectRoute/ObjectRoute.php

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;
 

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

src/Cache.php

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;

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"];
 

src/ObjectRequest/ObjectRequest.php

Spacing +9 added lines, -9 removed lines

@@ -163,9 +163,9 @@ 
      *
      * @return  Object  $this
      */
-    public function setAttribute($name=null, $value) {
+    public function setAttribute($name = null, $value) {
 
-        if ( is_null($name) ) array_push($this->attributes, $value);
+        if (is_null($name)) array_push($this->attributes, $value);
 
         else $this->attributes[$name] = $value;
 
@@ -182,7 +182,7 @@ 
      */
     public function unsetAttribute($attribute) {
 
-        if ( array_key_exists($attribute, $this->attributes) ) {
+        if (array_key_exists($attribute, $this->attributes)) {
 
             unset($this->attributes[$attribute]);
 
@@ -203,7 +203,7 @@ 
      */
     public function getAttribute($attribute) {
 
-        if ( array_key_exists($attribute, $this->attributes) ) {
+        if (array_key_exists($attribute, $this->attributes)) {
 
             return $this->attributes[$attribute];
 
@@ -277,7 +277,7 @@ 
      */
     public function unsetParameter($parameter) {
 
-        if ( array_key_exists($parameter, $this->parameters) ) {
+        if (array_key_exists($parameter, $this->parameters)) {
 
             unset($this->parameters[$parameter]);
 
@@ -298,7 +298,7 @@ 
      */
     public function getParameter($parameter) {
 
-        if ( array_key_exists($parameter, $this->parameters) ) {
+        if (array_key_exists($parameter, $this->parameters)) {
 
             return $this->parameters[$parameter];
 
@@ -379,7 +379,7 @@ 
      *
      * @return  ObjectRequest   $this
      */
-    public function setHeader($header, $value=null) {
+    public function setHeader($header, $value = null) {
 
         $this->headers[$header] = $value;
 
@@ -396,7 +396,7 @@ 
      */
     public function unsetHeader($header) {
 
-        if ( isset($this->headers[$header]) ) {
+        if (isset($this->headers[$header])) {
 
             unset($this->headers[$header]);
 
@@ -417,7 +417,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;
 

src/Header.php

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

src/ObjectResult/ObjectRedirect.php

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
 
     private $code = 307;
 
-    private $supported_redirect_codes = array(201,301,302,303,307);
+    private $supported_redirect_codes = array(201, 301, 302, 303, 307);
 
     private $location = null;
 
@@ -135,7 +135,7 @@ 
      *
      * @return  ObjectRequest   $this
      */
-    public function setHeader($header, $value=null) {
+    public function setHeader($header, $value = null) {
 
         $this->headers[$header] = $value;
 
@@ -152,7 +152,7 @@ 
      */
     public function unsetHeader($header) {
 
-        if ( isset($this->headers[$header]) ) {
+        if (isset($this->headers[$header])) {
 
             unset($this->headers[$header]);
 
@@ -173,7 +173,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;
 

src/ObjectResult/ObjectSuccess.php

Spacing +4 added lines, -4 removed lines

@@ -37,7 +37,7 @@ 
 
     private $charset = DISPATCHER_DEFAULT_ENCODING;
 
-    private $supported_success_codes = array(200,202,204);
+    private $supported_success_codes = array(200, 202, 204);
 
     /**
      * Set service name
@@ -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;
 

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;