comodojo / dispatcher.framework

src/Comodojo/Dispatcher/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();
 

src/Comodojo/Dispatcher/Request/Post.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
     private static function getParameters() {
 
-        switch( $_SERVER['REQUEST_METHOD'] ) {
+        switch ($_SERVER['REQUEST_METHOD']) {
 
             case 'POST':
 

src/Comodojo/Dispatcher/Components/DefaultConfiguration.php

Spacing +2 added lines, -2 removed lines

@@ -48,11 +48,11 @@
 
     private static function urlGetAbsolute() {
 
-        $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '') . '://';
+        $http = 'http'.((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '').'://';
 
         $uri = self::uriGetAbsolute();
 
-        return ( $http . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost') . $uri . "/" );
+        return ($http.(isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost').$uri."/");
 
     }
 

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/Components/HttpStatusCodes.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 
     public function getMessage($code) {
 
-        if ( $this->exists($code) ) return $this->codes[$code];
+        if ($this->exists($code)) return $this->codes[$code];
 
         throw new Exception("Invalid HTTP status code $code");
 

Braces +3 added lines, -1 removed lines

@@ -102,7 +102,9 @@
 
     public function getMessage($code) {
 
-        if ( $this->exists($code) ) return $this->codes[$code];
+        if ( $this->exists($code) ) {
+            return $this->codes[$code];
+        }
 
         throw new Exception("Invalid HTTP status code $code");
 

src/Comodojo/Dispatcher/Request/File.php

Doc Comments +3 added lines

@@ -44,6 +44,9 @@
 
     }
 
+    /**
+     * @return string
+     */
     public function getTemporaryName() {
 
         return $this->tname;

Spacing +3 added lines, -3 removed lines

@@ -108,9 +108,9 @@ 
 
         if (!empty($this->path) && file_exists($this->path)) {
 
-            $local_name = "$this->path/" . ($as_slug ? $this->getSlug() : $this->getFileName());
+            $local_name = "$this->path/".($as_slug ? $this->getSlug() : $this->getFileName());
 
-            if ( file_exists($local_name) ) {
+            if (file_exists($local_name)) {
 
                 $files = glob("$local_name*");
 
@@ -120,7 +120,7 @@ 
 
             }
 
-            if ( move_uploaded_file($this->getTemporaryName(), $local_name) ) {
+            if (move_uploaded_file($this->getTemporaryName(), $local_name)) {
 
                 // return file_exists($local_name);
                 return true;

Braces +3 added lines, -1 removed lines

@@ -84,7 +84,9 @@
 
         $file = $this->getTemporaryName();
 
-        if (file_exists($file)) return file_get_contents($file);
+        if (file_exists($file)) {
+            return file_get_contents($file);
+        }
 
         throw new Exception("File does not exists");
 

src/Comodojo/Dispatcher/Events/DispatcherEvent.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
     protected $dispatcher;
 
-    public function __construct( Dispatcher $dispatcher ) {
+    public function __construct(Dispatcher $dispatcher) {
 
         parent::__construct('dispatcher');
 

src/Comodojo/Dispatcher/Dispatcher.php

Doc Comments +3 added lines

@@ -207,6 +207,9 @@
 
     }
 
+    /**
+     * @param string $name
+     */
     private function createServiceSpecializedEvents($name) {
 
         $this->logger->debug("Emitting $name service-event");

Spacing +17 added lines, -17 removed lines

@@ -78,7 +78,7 @@ 
 
         // init core components
         // create new configuration object and merge configuration
-        $configuration_object = new Configuration( DefaultConfiguration::get() );
+        $configuration_object = new Configuration(DefaultConfiguration::get());
         $configuration_object->merge($configuration);
 
         $logger = is_null($logger) ? LogManager::createFromConfiguration($configuration_object)->getLogger() : $logger;
@@ -102,7 +102,7 @@ 
 
         } catch (Exception $e) {
 
-            $this->logger->critical($e->getMessage(),$e->getTrace());
+            $this->logger->critical($e->getMessage(), $e->getTrace());
 
             throw $e;
 
@@ -122,9 +122,9 @@ 
         $logger->debug("Starting to dispatch.");
 
         $logger->debug("Emitting global dispatcher event.");
-        $events->emit( new DispatcherEvent($this) );
+        $events->emit(new DispatcherEvent($this));
 
-        if ( $configuration->get('enabled') === false ) {
+        if ($configuration->get('enabled') === false) {
 
             $logger->debug("Dispatcher disabled, shutting down gracefully.");
 
@@ -140,11 +140,11 @@ 
 
         $cache = new ServerCache($this->getCache());
 
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.request') );
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.request.'.$this->request->method->get()) );
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.request.#') );
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.request'));
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.request.'.$this->request->method->get()));
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.request.#'));
 
-        if ( $cache->read($this->request, $this->response) ) {
+        if ($cache->read($this->request, $this->response)) {
             // we have a cache!
             // shutdown immediately
             return $this->shutdown();
@@ -170,10 +170,10 @@ 
 
         $logger->debug("Route acquired, type $route_type directed to $route_service");
 
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.route') );
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.route.'.$route_type) );
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.route.'.$route_service) );
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.route.#') );
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.route'));
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.route.'.$route_type));
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.route.'.$route_service));
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.route.#'));
 
         // translate route to service
         $logger->debug("Running $route_service service");
@@ -201,8 +201,8 @@ 
 
         $params = $route->getParameter('headers');
 
-        if ( !empty($params) && is_array($params) ) {
-            foreach($params as $name => $value) $this->getResponse()->getHeaders()->set($name, $value);
+        if (!empty($params) && is_array($params)) {
+            foreach ($params as $name => $value) $this->getResponse()->getHeaders()->set($name, $value);
         }
 
     }
@@ -247,9 +247,9 @@ 
 
         $response->consolidate($request, $this->route);
 
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.response') );
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.response.' . $response->getStatus()->get()) );
-        $events->emit( $this->createServiceSpecializedEvents('dispatcher.response.#') );
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.response'));
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.response.'.$response->getStatus()->get()));
+        $events->emit($this->createServiceSpecializedEvents('dispatcher.response.#'));
 
         $this->logger->debug("Composing return value");
 

Braces +3 added lines, -1 removed lines

@@ -202,7 +202,9 @@
         $params = $route->getParameter('headers');
 
         if ( !empty($params) && is_array($params) ) {
-            foreach($params as $name => $value) $this->getResponse()->getHeaders()->set($name, $value);
+            foreach($params as $name => $value) {
+                $this->getResponse()->getHeaders()->set($name, $value);
+            }
         }
 
     }

src/Comodojo/Dispatcher/Response/Model.php

Doc Comments +3 added lines

@@ -95,6 +95,9 @@
 
     }
 
+    /**
+     * @return string
+     */
     public function getContent() {
 
         return $this->content;

Spacing +15 added lines, -15 removed lines

@@ -35,7 +35,7 @@ 
 
     use TimingTrait;
 
-    protected static $no_content_statuses = [100,101,102,204,304];
+    protected static $no_content_statuses = [100, 101, 102, 204, 304];
 
     protected static $cacheable_methods = ['GET', 'HEAD', 'POST', 'PUT'];
 
@@ -137,7 +137,7 @@ 
 
     public function export() {
 
-        return (object) [
+        return (object)[
             'headers' => $this->getHeaders(),
             'cookies' => $this->getCookies()->getAll(),
             'status' => $this->getStatus(),
@@ -149,12 +149,12 @@ 
 
     public function import($data) {
 
-        if ( isset($data->headers) ) $this->setHeaders($data->headers);
-        if ( isset($data->status) ) $this->setStatus($data->status);
-        if ( isset($data->content) ) $this->setContent($data->content);
-        if ( isset($data->location) ) $this->setLocation($data->location);
+        if (isset($data->headers)) $this->setHeaders($data->headers);
+        if (isset($data->status)) $this->setStatus($data->status);
+        if (isset($data->content)) $this->setContent($data->content);
+        if (isset($data->location)) $this->setLocation($data->location);
 
-        if ( isset($data->cookies) && is_array($data->cookies) ) {
+        if (isset($data->cookies) && is_array($data->cookies)) {
             $cookies = $this->getCookies();
             foreach ($data->cookies as $name => $cookie) $cookies->add($cookie);
         }
@@ -168,7 +168,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);
@@ -176,7 +176,7 @@ 
 
         $output->consolidate();
 
-        if ( $route != null ) {
+        if ($route != null) {
             $this->setClientCache($request, $route);
         }
 
@@ -184,7 +184,7 @@ 
         $content = $this->getContent();
         $headers = $this->getHeaders();
 
-        if ( (string) $request->getMethod() == 'HEAD' && !in_array($status, self::$no_content_statuses) ) {
+        if ((string)$request->getMethod() == 'HEAD' && !in_array($status, self::$no_content_statuses)) {
             $length = $content->length();
             $content->set(null);
             if ($length) $headers->set('Content-Length', $length);
@@ -194,7 +194,7 @@ 
             $headers->delete('Content-Length');
         }
 
-        if ( (string) $request->getVersion() == '1.0' && false !== strpos($headers->get('Cache-Control'), 'no-cache')) {
+        if ((string)$request->getVersion() == '1.0' && false !== strpos($headers->get('Cache-Control'), 'no-cache')) {
             $headers->set('pragma', 'no-cache');
             $headers->set('expires', -1);
         }
@@ -204,20 +204,20 @@ 
     private function setClientCache(Request $request, Route $route) {
 
         $cache = strtoupper($route->getParameter('cache'));
-        $ttl = (int) $route->getParameter('ttl');
+        $ttl = (int)$route->getParameter('ttl');
 
         if (
             ($cache == 'CLIENT' || $cache == 'BOTH') &&
-            in_array((string) $request->getMethod(), self::$cacheable_methods) &&
+            in_array((string)$request->getMethod(), self::$cacheable_methods) &&
             in_array($this->getStatus()->get(), self::$cacheable_statuses)
             // @TODO: here we should also check for Cache-Control no-store or private;
             //        the cache layer will be improoved in future versions.
         ) {
 
             $headers = $this->getHeaders();
-            $timestamp = (int) $this->getTime()->format('U') + $ttl;
+            $timestamp = (int)$this->getTime()->format('U')+$ttl;
 
-            if ( $ttl > 0 ) {
+            if ($ttl > 0) {
 
                 $headers->set("Cache-Control", "max-age=".$ttl.", must-revalidate");
                 $headers->set("Expires", gmdate("D, d M Y H:i:s", $timestamp)." GMT");

Braces +18 added lines, -6 removed lines

@@ -149,14 +149,24 @@ 
 
     public function import($data) {
 
-        if ( isset($data->headers) ) $this->setHeaders($data->headers);
-        if ( isset($data->status) ) $this->setStatus($data->status);
-        if ( isset($data->content) ) $this->setContent($data->content);
-        if ( isset($data->location) ) $this->setLocation($data->location);
+        if ( isset($data->headers) ) {
+            $this->setHeaders($data->headers);
+        }
+        if ( isset($data->status) ) {
+            $this->setStatus($data->status);
+        }
+        if ( isset($data->content) ) {
+            $this->setContent($data->content);
+        }
+        if ( isset($data->location) ) {
+            $this->setLocation($data->location);
+        }
 
         if ( isset($data->cookies) && is_array($data->cookies) ) {
             $cookies = $this->getCookies();
-            foreach ($data->cookies as $name => $cookie) $cookies->add($cookie);
+            foreach ($data->cookies as $name => $cookie) {
+                $cookies->add($cookie);
+            }
         }
 
     }
@@ -187,7 +197,9 @@ 
         if ( (string) $request->getMethod() == 'HEAD' && !in_array($status, self::$no_content_statuses) ) {
             $length = $content->length();
             $content->set(null);
-            if ($length) $headers->set('Content-Length', $length);
+            if ($length) {
+                $headers->set('Content-Length', $length);
+            }
         }
 
         if ($headers->get('Transfer-Encoding') != null) {