comodojo / dispatcher.framework

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

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
     public function __get($name) {
         
-        if ( array_key_exists($name, $this->data) ) {
+        if (array_key_exists($name, $this->data)) {
             
             return $this->data[$name];
             

src/Comodojo/Dispatcher/Router/Table.php

Spacing +6 added lines, -6 removed lines

@@ -121,9 +121,9 @@ 
 
     public function load($routes) {
 
-        if ( !empty($routes) ) {
+        if (!empty($routes)) {
 
-            foreach( $routes as $name => $route ) {
+            foreach ($routes as $name => $route) {
 
                 $this->add($route['route'], $route['type'], $route['class'], $route['parameters']);
 
@@ -139,7 +139,7 @@ 
 
     private function readCache() {
 
-        if ( $this->configuration->get('routing-table-cache') !== true ) return;
+        if ($this->configuration->get('routing-table-cache') !== true) return;
 
         $this->routes = $this->cache->setNamespace('dispatcherinternals')->get("dispatcher-routes");
 
@@ -151,7 +151,7 @@ 
 
     private function dumpCache() {
 
-        if ( $this->configuration->get('routing-table-cache') !== true ) return;
+        if ($this->configuration->get('routing-table-cache') !== true) return;
 
         $ttl = $this->configuration->get('routing-table-ttl');
 
@@ -170,14 +170,14 @@ 
             ->setClassName($class) // Class to be invoked
             ->setParameters($parameters); // Parameters passed via the composer.json configuration (cache, ttl, etc...)
 
-        $this->logger->debug("ROUTE: " . implode("/", $folders));
+        $this->logger->debug("ROUTE: ".implode("/", $folders));
 
         //$this->logger->debug("PARAMETERS: " . var_export($value, true));
 
         // This method generate a global regular expression which will be able to match all the URI supported by the route
         $regex = $this->parser->read($folders, $route);
 
-        $this->logger->debug("ROUTE: " . $regex);
+        $this->logger->debug("ROUTE: ".$regex);
 
         //$this->logger->debug("PARAMETERS: " . var_export($value, true));
 

Braces +11 added lines, -6 removed lines

@@ -78,10 +78,11 @@ 
 
         $regex = $this->regex($route);
 
-        if (isset($this->routes[$regex]))
-            return $this->routes[$regex];
-        else
-            return null;
+        if (isset($this->routes[$regex])) {
+                    return $this->routes[$regex];
+        } else {
+                    return null;
+        }
 
     }
 
@@ -139,7 +140,9 @@ 
 
     private function readCache() {
 
-        if ( $this->configuration->get('routing-table-cache') !== true ) return;
+        if ( $this->configuration->get('routing-table-cache') !== true ) {
+            return;
+        }
 
         $this->routes = $this->cache->setNamespace('dispatcherinternals')->get("dispatcher-routes");
 
@@ -157,7 +160,9 @@ 
 
     private function dumpCache() {
 
-        if ( $this->configuration->get('routing-table-cache') !== true ) return;
+        if ( $this->configuration->get('routing-table-cache') !== true ) {
+            return;
+        }
 
         $ttl = $this->configuration->get('routing-table-ttl');
 

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

Spacing +16 added lines, -16 removed lines

@@ -62,11 +62,11 @@ 
 

         if (

             empty($log) ||

-            ( isset($log['enabled']) && $log['enabled'] === false ) ||

+            (isset($log['enabled']) && $log['enabled'] === false) ||

             empty($log['providers'])

         ) {

 

-            $logger->pushHandler( new NullHandler( self::getLevel() ) );

+            $logger->pushHandler(new NullHandler(self::getLevel()));

 

         } else {

 

@@ -74,7 +74,7 @@ 
 

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

 

-                if ( $handler instanceof HandlerInterface ) $logger->pushHandler($handler);

+                if ($handler instanceof HandlerInterface) $logger->pushHandler($handler);

 

             }

 

@@ -101,7 +101,7 @@ 
 

     protected function getHandler($provider, $parameters) {

 

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

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

 

             case 'StreamHandler':

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

@@ -129,13 +129,13 @@ 
 

         $stream = $this->configuration->get('base-path').'/'.(empty($parameters['stream']) ? 'dispatcher.log' : $parameters['stream']);

 

-        $level = self::getLevel( empty($parameters['level']) ? null : $parameters['level'] );

+        $level = self::getLevel(empty($parameters['level']) ? null : $parameters['level']);

 

-        $bubble = self::getBubble( empty($parameters['bubble']) ? true : $parameters['bubble'] );

+        $bubble = self::getBubble(empty($parameters['bubble']) ? true : $parameters['bubble']);

 

-        $filePermission = self::getFilePermission( empty($parameters['filePermission']) ? null : $parameters['filePermission'] );

+        $filePermission = self::getFilePermission(empty($parameters['filePermission']) ? null : $parameters['filePermission']);

 

-        $useLocking = self::getLocking( empty($parameters['useLocking']) ? false : $parameters['useLocking'] );

+        $useLocking = self::getLocking(empty($parameters['useLocking']) ? false : $parameters['useLocking']);

 

         return new StreamHandler($stream, $level, $bubble, $filePermission, $useLocking);

 

@@ -143,13 +143,13 @@ 
 

     protected function getSyslogHandler($name, $parameters) {

 

-        if ( empty($parameters['ident']) ) return null;

+        if (empty($parameters['ident'])) return null;

 

         $facility = empty($parameters['facility']) ? LOG_USER : $parameters['facility'];

 

-        $level = self::getLevel( empty($parameters['level']) ? null : $parameters['level'] );

+        $level = self::getLevel(empty($parameters['level']) ? null : $parameters['level']);

 

-        $bubble = self::getBubble( empty($parameters['bubble']) ? true : $parameters['bubble'] );

+        $bubble = self::getBubble(empty($parameters['bubble']) ? true : $parameters['bubble']);

 

         $logopts = empty($parameters['logopts']) ? LOG_PID : $parameters['logopts'];

 

@@ -161,11 +161,11 @@ 
 

         $messageType = empty($parameters['messageType']) ? ErrorLogHandler::OPERATING_SYSTEM : $parameters['messageType'];

 

-        $level = self::getLevel( empty($parameters['level']) ? null : $parameters['level'] );

+        $level = self::getLevel(empty($parameters['level']) ? null : $parameters['level']);

 

-        $bubble = self::getBubble( empty($parameters['bubble']) ? true : $parameters['bubble'] );

+        $bubble = self::getBubble(empty($parameters['bubble']) ? true : $parameters['bubble']);

 

-        $expandNewlines = self::getExpandNewlines( empty($parameters['expandNewlines']) ? false : $parameters['expandNewlines'] );

+        $expandNewlines = self::getExpandNewlines(empty($parameters['expandNewlines']) ? false : $parameters['expandNewlines']);

 

         return new ErrorLogHandler($messageType, $level, $bubble, $expandNewlines);

 

@@ -182,7 +182,7 @@ 
 

         $level = strtoupper($level);

 

-        if ( array_key_exists($level, self::$levels) ) return self::$levels[$level];

+        if (array_key_exists($level, self::$levels)) return self::$levels[$level];

 

         return self::$levels['DEBUG'];

 

@@ -200,7 +200,7 @@ 
 

     protected static function getFilePermission($filepermission = null) {

 

-        if ( is_null($filepermission) ) return null;

+        if (is_null($filepermission)) return null;

 

         return filter_var($filepermission, FILTER_VALIDATE_INT, array(

             'options' => array(

Braces +12 added lines, -4 removed lines

@@ -74,7 +74,9 @@ 
 

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

 

-                if ( $handler instanceof HandlerInterface ) $logger->pushHandler($handler);

+                if ( $handler instanceof HandlerInterface ) {
+                    $logger->pushHandler($handler);
+                }
 

             }

 

@@ -143,7 +145,9 @@ 
 

     protected function getSyslogHandler($name, $parameters) {

 

-        if ( empty($parameters['ident']) ) return null;

+        if ( empty($parameters['ident']) ) {
+            return null;
+        }
 

         $facility = empty($parameters['facility']) ? LOG_USER : $parameters['facility'];

 

@@ -182,7 +186,9 @@ 
 

         $level = strtoupper($level);

 

-        if ( array_key_exists($level, self::$levels) ) return self::$levels[$level];

+        if ( array_key_exists($level, self::$levels) ) {
+            return self::$levels[$level];
+        }
 

         return self::$levels['DEBUG'];

 

@@ -200,7 +206,9 @@ 
 

     protected static function getFilePermission($filepermission = null) {

 

-        if ( is_null($filepermission) ) return null;

+        if ( is_null($filepermission) ) {
+            return null;
+        }
 

         return filter_var($filepermission, FILTER_VALIDATE_INT, array(

             'options' => array(

src/Comodojo/Dispatcher/Request/File.php

Spacing +5 added lines, -5 removed lines

@@ -62,7 +62,7 @@ 
     public function getLocalName() {
 
         if (!empty($this->path))
-            return $this->path . "/" . $this->slug;
+            return $this->path."/".$this->slug;
         else
             return '';
 
@@ -183,17 +183,17 @@ 
 
         preg_match_all("/[a-z0-9]+/", iconv("UTF-8", "ASCII//TRANSLIT", strtolower(preg_replace('/\..*?$/', '', $this->fname))), $matches);
 
-        $this->slug  = implode('-', $matches[0]);
+        $this->slug = implode('-', $matches[0]);
 
         if (!empty($this->path)) {
 
-            $files = glob($this->path . "/" . $slug . "*");
+            $files = glob($this->path."/".$slug."*");
 
-            $count = count ($files);
+            $count = count($files);
 
             if ($count > 0) {
 
-                $this->slug .= "-" . $count;
+                $this->slug .= "-".$count;
 
             }
 

Braces +8 added lines, -6 removed lines

@@ -61,10 +61,11 @@ 
 
     public function getLocalName() {
 
-        if (!empty($this->path))
-            return $this->path . "/" . $this->slug;
-        else
-            return '';
+        if (!empty($this->path)) {
+                    return $this->path . "/" . $this->slug;
+        } else {
+                    return '';
+        }
 
     }
 
@@ -102,8 +103,9 @@ 
 
         $file = $this->getTemporaryName();
 
-        if (file_exists($file))
-            return file_get_contents($file);
+        if (file_exists($file)) {
+                    return file_get_contents($file);
+        }
 
         throw new DispatcherException("File does not exists");