comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Response/Content.php

Spacing +2 added lines, -2 removed lines

@@ -41,9 +41,9 @@
 
     }
 
-    public function set($content=null) {
+    public function set($content = null) {
 
-        if ( !is_scalar($content) && $content != null ) {
+        if (!is_scalar($content) && $content != null) {
 
             throw new Exception("Invalid HTTP content");
 

src/Comodojo/Dispatcher/Response/Model.php

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