comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Components/DataSerialization.php

Doc Comments +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      *
      * @param string $data Serialized data
      *
-     * @return Routes $this
+     * @return boolean $this
      */
     public function unserialize($data) {
 

src/Comodojo/Dispatcher/Response/Model.php

Spacing +9 added lines, -9 removed lines

@@ -62,7 +62,7 @@ 
         $output_class_name = "\\Comodojo\\Dispatcher\\Response\\Preprocessor\\Status".$status;
 
         // @TODO: this condition will be removed when all preprocessors ready
-        if ( class_exists($output_class_name) ) {
+        if (class_exists($output_class_name)) {
             $output = new $output_class_name($this);
         } else {
             $output = new \Comodojo\Dispatcher\Response\Preprocessor\Status200($this);
@@ -70,13 +70,13 @@ 
 
         $output->consolidate();
 
-        if ( $route != null ) {
+        if ($route != null) {
             $this->setClientCache($request, $route);
         }
 
         // extra checks
 
-        if ( $request->method->get() == 'HEAD' && !in_array($status, array(100,101,102,204,304)) ) {
+        if ($request->method->get() == 'HEAD' && !in_array($status, array(100, 101, 102, 204, 304))) {
             $length = $this->content->length();
             $this->content->set(null);
             if ($length) $this->headers->set('Content-Length', $length);
@@ -86,7 +86,7 @@ 
             $this->headers->delete('Content-Length');
         }
 
-        if ( $request->version->get() == '1.0' && false !== strpos($this->headers->get('Cache-Control'), 'no-cache')) {
+        if ($request->version->get() == '1.0' && false !== strpos($this->headers->get('Cache-Control'), 'no-cache')) {
             $this->headers->set('pragma', 'no-cache');
             $this->headers->set('expires', -1);
         }
@@ -106,15 +106,15 @@ 
             //        the cache layer will be improoved in future versions.
         ) {
 
-            if ( $ttl > 0 ) {
+            if ($ttl > 0) {
 
-                $this->headers->set("Cache-Control","max-age=".$ttl.", must-revalidate");
-                $this->headers->set("Expires",gmdate("D, d M Y H:i:s", (int)$this->getTimestamp() + $ttl)." GMT");
+                $this->headers->set("Cache-Control", "max-age=".$ttl.", must-revalidate");
+                $this->headers->set("Expires", gmdate("D, d M Y H:i:s", (int)$this->getTimestamp()+$ttl)." GMT");
 
             } else {
 
-                $this->headers->set("Cache-Control","no-cache, must-revalidate");
-                $this->headers->set("Expires","Mon, 26 Jul 1997 05:00:00 GMT");
+                $this->headers->set("Cache-Control", "no-cache, must-revalidate");
+                $this->headers->set("Expires", "Mon, 26 Jul 1997 05:00:00 GMT");
 
             }
 

Braces +3 added lines, -1 removed lines

@@ -79,7 +79,9 @@
         if ( $request->method->get() == 'HEAD' && !in_array($status, array(100,101,102,204,304)) ) {
             $length = $this->content->length();
             $this->content->set(null);
-            if ($length) $this->headers->set('Content-Length', $length);
+            if ($length) {
+                $this->headers->set('Content-Length', $length);
+            }
         }
 
         if ($this->headers->get('Transfer-Encoding') != null) {

src/Comodojo/Dispatcher/Response/Status.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
 
     public function set($code) {
 
-        if ( !$this->codes->exists($code) ) {
+        if (!$this->codes->exists($code)) {
 
             throw new Exception("Invalid HTTP Status Code $code");
 
@@ -60,9 +60,9 @@ 
 
     }
 
-    public function description($code=null) {
+    public function description($code = null) {
 
-        if ( is_null($code) ) return $this->codes->getMessage($this->status_code);
+        if (is_null($code)) return $this->codes->getMessage($this->status_code);
         
         return $this->codes->getMessage($code);
 

Braces +3 added lines, -1 removed lines

@@ -62,7 +62,9 @@
 
     public function description($code=null) {
 
-        if ( is_null($code) ) return $this->codes->getMessage($this->status_code);
+        if ( is_null($code) ) {
+            return $this->codes->getMessage($this->status_code);
+        }
         
         return $this->codes->getMessage($code);
 

src/Comodojo/Dispatcher/Response/Preprocessor/Status301.php

Spacing +2 added lines, -2 removed lines

@@ -32,11 +32,11 @@
 
         $location = $this->response->location->get();
 
-        if ( empty($location) ) throw new Exception("Invalid location, cannot redirect");
+        if (empty($location)) throw new Exception("Invalid location, cannot redirect");
 
         $this->response->headers->set("Location: ".$location);
 
-        if ( empty($this->response->content->get()) ) {
+        if (empty($this->response->content->get())) {
 
             $this->response->content->set(sprintf('<!DOCTYPE html>
 <html>

src/Comodojo/Dispatcher/Response/Preprocessor/Status100.php

Spacing +3 added lines, -3 removed lines

@@ -28,9 +28,9 @@
 
     public function consolidate() {
 
-        $this->response->content>set(null);
-        $this->response->headers>delete('Content-Type');
-        $this->response->headers>delete('Content-Length');
+        $this->response->content > set(null);
+        $this->response->headers > delete('Content-Type');
+        $this->response->headers > delete('Content-Length');
 
     }
 

src/Comodojo/Dispatcher/Response/Preprocessor/Status201.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
         $location = $this->response->location->get();
 
-        if ( $location != null ) $this->response->headers->set("Location: ".$location);
+        if ($location != null) $this->response->headers->set("Location: ".$location);
 
         parent::consolidate();
 

Braces +3 added lines, -1 removed lines

@@ -30,7 +30,9 @@
 
         $location = $this->response->location->get();
 
-        if ( $location != null ) $this->response->headers->set("Location: ".$location);
+        if ( $location != null ) {
+            $this->response->headers->set("Location: ".$location);
+        }
 
         parent::consolidate();
 

src/Comodojo/Dispatcher/Dispatcher.php

Spacing +22 added lines, -22 removed lines

@@ -60,7 +60,7 @@ 
         $this->setTimestamp();
 
         // parsing configuration
-        $this->configuration = new Configuration( DefaultConfiguration::get() );
+        $this->configuration = new Configuration(DefaultConfiguration::get());
 
         $this->configuration->merge($configuration);
 
@@ -91,9 +91,9 @@ 
 
         $this->logger->debug("Emitting global dispatcher event.");
 
-        $this->events->emit( new DispatcherEvent($this) );
+        $this->events->emit(new DispatcherEvent($this));
 
-        if ( $this->configuration->get('enabled') === false ) {
+        if ($this->configuration->get('enabled') === false) {
 
             $this->logger->debug("Dispatcher disabled, shutting down gracefully.");
 
@@ -109,13 +109,13 @@ 
 
         }
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.request') );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.request'));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.request.'.$this->request->method->get()) );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.request.'.$this->request->method->get()));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.request.#') );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.request.#'));
 
-        if ( $this->readCache() ) {
+        if ($this->readCache()) {
 
             return $this->shutdown();
 
@@ -145,13 +145,13 @@ 
 
         $this->logger->debug("Route acquired, type $route_type directed to $route_service.");
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.route') );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.route'));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.route.'.$route_type) );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.route.'.$route_type));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.route.'.$route_service) );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.route.'.$route_service));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.route.#') );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.route.#'));
 
         // translate route to service
 
@@ -179,11 +179,11 @@ 
 
     private function readCache() {
 
-        $name = (string) $this->request->uri;
+        $name = (string)$this->request->uri;
 
         $cache = $this->cache->setNamespace('dispatcherservice')->get($name);
 
-        if ( is_null($cache) ) return false;
+        if (is_null($cache)) return false;
 
         $this->response->import($cache);
 
@@ -195,7 +195,7 @@ 
 
         $cache = strtoupper($route->getParameter('cache'));
         $ttl = $route->getParameter('ttl');
-        $name = (string) $this->request->uri;
+        $name = (string)$this->request->uri;
         $method = $this->request->method->get();
         $status = $this->response->status->get();
 
@@ -203,10 +203,10 @@ 
         //        because of dispatcher internal structure: if post request is cached
         //        subsequent requests will never reach the service.
         if (
-            ( $cache == 'SERVER' || $cache == 'BOTH' ) &&
+            ($cache == 'SERVER' || $cache == 'BOTH') &&
             in_array($request->method->get(), array('GET', 'HEAD')) &&
             in_array($this->status->get(), array(200, 203, 300, 301, 302, 404, 410))
-        ){
+        ) {
 
             $this->cache->setNamespace('dispatcherservice')->set($name, $this->response->export(), $ttl);
 
@@ -218,9 +218,9 @@ 
 
         $params = $route->getParameter('headers');
 
-        if ( !empty($params) && is_array($params) ) {
+        if (!empty($params) && is_array($params)) {
 
-            foreach($params as $name=>$value) $this->response->headers->set($name, $value);
+            foreach ($params as $name=>$value) $this->response->headers->set($name, $value);
         }
 
     }
@@ -260,11 +260,11 @@ 
 
         $this->response->consolidate($this->request, $this->route);
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.response') );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.response'));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.response.'.$this->response->status->get()) );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.response.'.$this->response->status->get()));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.response.#') );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.response.#'));
 
         $this->logger->debug("Composing return value.");
 
@@ -272,7 +272,7 @@ 
 
         $this->logger->debug("Dispatcher run-cycle ends.");
 
-        if ( function_exists('fastcgi_finish_request') ) fastcgi_finish_request();
+        if (function_exists('fastcgi_finish_request')) fastcgi_finish_request();
         else ob_end_clean();
 
         return $return;

Braces +11 added lines, -4 removed lines

@@ -183,7 +183,9 @@ 
 
         $cache = $this->cache->setNamespace('dispatcherservice')->get($name);
 
-        if ( is_null($cache) ) return false;
+        if ( is_null($cache) ) {
+            return false;
+        }
 
         $this->response->import($cache);
 
@@ -220,7 +222,9 @@ 
 
         if ( !empty($params) && is_array($params) ) {
 
-            foreach($params as $name=>$value) $this->response->headers->set($name, $value);
+            foreach($params as $name=>$value) {
+                $this->response->headers->set($name, $value);
+            }
         }
 
     }
@@ -272,8 +276,11 @@ 
 
         $this->logger->debug("Dispatcher run-cycle ends.");
 
-        if ( function_exists('fastcgi_finish_request') ) fastcgi_finish_request();
-        else ob_end_clean();
+        if ( function_exists('fastcgi_finish_request') ) {
+            fastcgi_finish_request();
+        } else {
+            ob_end_clean();
+        }
 
         return $return;
 

src/Comodojo/Dispatcher/Output/Processor.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 
         $status = $this->response->status->get();
 
-        if ( !$this->codes->exists($status) ) throw new Exception("Invalid HTTP status code in response");
+        if (!$this->codes->exists($status)) throw new Exception("Invalid HTTP status code in response");
 
         $message = $this->codes->getMessage($status);
 

Braces +3 added lines, -1 removed lines

@@ -61,7 +61,9 @@
 
         $status = $this->response->status->get();
 
-        if ( !$this->codes->exists($status) ) throw new Exception("Invalid HTTP status code in response");
+        if ( !$this->codes->exists($status) ) {
+            throw new Exception("Invalid HTTP status code in response");
+        }
 
         $message = $this->codes->getMessage($status);
 

src/Comodojo/Dispatcher/Components/CacheManager.php

Spacing +9 added lines, -9 removed lines

@@ -35,25 +35,25 @@ 
 

         $cache = $this->configuration->get('cache');

 

-        if ( empty($cache) ) {

+        if (empty($cache)) {

 

             $manager = new ComodojoCacheManager(self::getAlgorithm(), $this->logger);

 

         } else {

 

-            $enabled = ( empty($cache['enabled']) || $cache['enabled'] === true ) ? true : false;

+            $enabled = (empty($cache['enabled']) || $cache['enabled'] === true) ? true : false;

 

-            $algorithm = self::getAlgorithm( empty($cache['algorithm']) ? null : $cache['algorithm']);

+            $algorithm = self::getAlgorithm(empty($cache['algorithm']) ? null : $cache['algorithm']);

 

             $manager = new ComodojoCacheManager($algorithm, $this->logger);

 

-            if ( $enabled && !empty($cache['providers']) ) {

+            if ($enabled && !empty($cache['providers'])) {

 

                 foreach ($cache['providers'] as $provider => $parameters) {

 

                     $handler = $this->getHandler($provider, $parameters);

 

-                    if ( $handler instanceof CacheInterface ) $manager->addProvider($handler);

+                    if ($handler instanceof CacheInterface) $manager->addProvider($handler);

 

                 }

 

@@ -80,13 +80,13 @@ 
 

     protected function getHandler($provider, $parameters) {

 

-        switch ( strtolower($parameters['type']) ) {

+        switch (strtolower($parameters['type'])) {

 

             case 'filecache':

 

                 $base = $this->configuration->get('base-path');

 

-                if ( empty($parameters['folder']) ||  empty($base) ) {

+                if (empty($parameters['folder']) || empty($base)) {

                     $this->logger->warning("Wrong cache provider, disabling $provider", $parameters);

                     break;

                 }

@@ -99,7 +99,7 @@ 
 

             case 'memcached':

 

-                if ( empty($parameters['host']) ) {

+                if (empty($parameters['host'])) {

                     $this->logger->warning("Wrong cache provider, disabling $provider", $parameters);

                     break;

                 }

@@ -132,7 +132,7 @@ 
      */

     protected static function getAlgorithm($algorithm = null) {

 

-        switch ( strtoupper($algorithm) ) {

+        switch (strtoupper($algorithm)) {

 

             case 'PICK_LAST':

                 $selected = ComodojoCacheManager::PICK_LAST;