comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Components/CacheManager.php

Braces +3 added lines, -1 removed lines

@@ -64,7 +64,9 @@
 

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

 

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

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

                 }

 

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;

src/Comodojo/Dispatcher/Components/EventsManager.php

Spacing +7 added lines, -7 removed lines

@@ -47,7 +47,7 @@ 
 
         $callable = $this->convertToListener($class, $event);
 
-        if ( $callable === false ) return null;
+        if ($callable === false) return null;
 
         return $this->addListener($event, $callable, $priority);
 
@@ -57,7 +57,7 @@ 
 
         $callable = $this->convertToListener($class, $event);
 
-        if ( $callable === false ) return null;
+        if ($callable === false) return null;
 
         return $this->addOneTimeListener($event, $callable, $priority);
 
@@ -65,7 +65,7 @@ 
 
     protected function convertToListener($class, $event) {
 
-        if ( !class_exists($class) ) {
+        if (!class_exists($class)) {
 
             $this->logger->error("Cannot subscribe class $class to event $event: cannot find class");
 
@@ -91,11 +91,11 @@ 
 
     public function load($plugins) {
 
-        if ( !empty($plugins) ) {
+        if (!empty($plugins)) {
 
-            foreach( $plugins as $name => $plugin ) {
+            foreach ($plugins as $name => $plugin) {
 
-                if ( !isset($plugin['class']) || !isset($plugin["event"]) ) {
+                if (!isset($plugin['class']) || !isset($plugin["event"])) {
 
                     $this->logger->error("Invalid plugin definition", $plugin);
 
@@ -106,7 +106,7 @@ 
                 $priority = isset($plugin['priority']) ? $plugin['priority'] : 0;
                 $onetime = isset($plugin['onetime']) ? $plugin['onetime'] : 0;
 
-                if ( $onetime ) $this->subscribeOnce($plugin['event'], $plugin['class'], $priority);
+                if ($onetime) $this->subscribeOnce($plugin['event'], $plugin['class'], $priority);
                 else $this->subscribe($plugin['event'], $plugin['class'], $priority);
 
             }

Braces +11 added lines, -4 removed lines

@@ -47,7 +47,9 @@ 
 
         $callable = $this->convertToListener($class, $event);
 
-        if ( $callable === false ) return null;
+        if ( $callable === false ) {
+            return null;
+        }
 
         return $this->addListener($event, $callable, $priority);
 
@@ -57,7 +59,9 @@ 
 
         $callable = $this->convertToListener($class, $event);
 
-        if ( $callable === false ) return null;
+        if ( $callable === false ) {
+            return null;
+        }
 
         return $this->addOneTimeListener($event, $callable, $priority);
 
@@ -106,8 +110,11 @@ 
                 $priority = isset($plugin['priority']) ? $plugin['priority'] : 0;
                 $onetime = isset($plugin['onetime']) ? $plugin['onetime'] : 0;
 
-                if ( $onetime ) $this->subscribeOnce($plugin['event'], $plugin['class'], $priority);
-                else $this->subscribe($plugin['event'], $plugin['class'], $priority);
+                if ( $onetime ) {
+                    $this->subscribeOnce($plugin['event'], $plugin['class'], $priority);
+                } else {
+                    $this->subscribe($plugin['event'], $plugin['class'], $priority);
+                }
 
             }
 

src/Comodojo/Dispatcher/Router/Table.php

Braces +14 added lines, -7 removed lines

@@ -84,10 +84,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;
+        }
 
     }
 
@@ -157,11 +158,15 @@ 
     
     private function readCache() {
         
-        if ( $this->configuration()->get('routing-table-cache') !== true ) return;
+        if ( $this->configuration()->get('routing-table-cache') !== true ) {
+            return;
+        }
         
         $routes = $this->cache->setNamespace('dispatcher-internals')->get("dispatcher-routes");
         
-        if (is_null($routes)) return;
+        if (is_null($routes)) {
+            return;
+        }
         
         foreach ($routes as $name => $data) {
             
@@ -177,7 +182,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');
         

Spacing +6 added lines, -6 removed lines

@@ -117,9 +117,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']);
 
@@ -135,7 +135,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");
 
@@ -147,7 +147,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');
 
@@ -166,14 +166,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));
 

src/Comodojo/Dispatcher/Router/Model.php

Spacing +5 added lines, -5 removed lines

@@ -108,10 +108,10 @@ 
 
         $methods = $this->configuration->get('allowed-http-methods');
 
-        if ( ( $methods != null || !empty($methods) ) && in_array($method, $methods) === false ) {
+        if (($methods != null || !empty($methods)) && in_array($method, $methods) === false) {
 
             throw new DispatcherException("Method not allowed", 0, null, 405, array(
-                "Allow" => implode(",",$methods)
+                "Allow" => implode(",", $methods)
             ));
 
         }
@@ -138,7 +138,7 @@ 
             
         }
         
-        if ( $this->bypass_service ) {
+        if ($this->bypass_service) {
             
             return;
             
@@ -158,7 +158,7 @@ 
 
             $methods = $service->getImplementedMethods();
 
-            if ( in_array($method, $methods) ) {
+            if (in_array($method, $methods)) {
 
                 $callable = $service->getMethod($method);
 
@@ -201,7 +201,7 @@ 
         foreach ($this->table->routes() as $regex => $value) {
             
             // The current uri is checked against all the global regular expressions associated with the routes
-            if (preg_match("/" . $regex . "/", $path, $matches)) {
+            if (preg_match("/".$regex."/", $path, $matches)) {
 
                 /* If a route is matched, all the bits of the route string are evalued in order to create
                  * new query parameters which will be available for the service class

Braces +5 added lines, -2 removed lines

@@ -105,7 +105,9 @@ 
 
         if (!$this->bypass_routing) {
 
-            if (!$this->parse()) throw new DispatcherException("Unable to find a valid route for the specified uri", 0, null, 404);
+            if (!$this->parse()) {
+                throw new DispatcherException("Unable to find a valid route for the specified uri", 0, null, 404);
+            }
 
         }
 
@@ -133,8 +135,9 @@ 
                 $this->extra
             );
 
+        } else {
+            return null;
         }
-        else return null;
         
     }
 

src/Comodojo/Dispatcher/Components/LogManager.php

Braces +9 added lines, -3 removed lines

@@ -65,7 +65,9 @@ 
 

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

 

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

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

             }

 

@@ -112,7 +114,9 @@ 
                 

             case 'SyslogHandler':

                 

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

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

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

             

@@ -211,7 +215,9 @@ 
     

     protected static function getFilePermission($filepermission = null) {

         

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

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

         return filter_var($bubble, FILTER_VALIDATE_INT, array(

             'options' => array(

Spacing +16 added lines, -16 removed lines

@@ -47,13 +47,13 @@ 
 

         if (

             empty($log) ||

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

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

             empty($log['providers'])

         ) {

 

             $logger = new Logger('dispatcher');

 

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

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

 

         } else {

 

@@ -65,7 +65,7 @@ 
 

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

 

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

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

 

             }

 

@@ -92,19 +92,19 @@ 
 

     protected function getHandler($provider, $parameters) {

 

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

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

 

             case 'StreamHandler':

 

                 $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']);

 

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

 

@@ -112,13 +112,13 @@ 
 

             case 'SyslogHandler':

 

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

 

@@ -130,11 +130,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']);

 

                 $handler = new ErrorLogHandler($messageType, $level, $bubble, $expandNewlines);

 

@@ -158,7 +158,7 @@ 
      */

     protected static function getLevel($level = null) {

 

-        switch ( strtoupper($level) ) {

+        switch (strtoupper($level)) {

 

             case 'INFO':

                 $logger_level = Logger::INFO;

@@ -211,7 +211,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(

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/Preprocessor/Status301.php

Braces +3 added lines, -1 removed lines

@@ -32,7 +32,9 @@
 
         $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);
 

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

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         // An Allow Header should be provided from DispatcherException
         $allow = $this->response()->headers()->get('Allow');
 
-        if ( is_null($allow) ) throw new Exception("Missing Allow header");
+        if (is_null($allow)) throw new Exception("Missing Allow header");
 
         parent::consolidate();
 

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
         // An Allow Header should be provided from DispatcherException
         $allow = $this->response()->headers()->get('Allow');
 
-        if ( is_null($allow) ) throw new Exception("Missing Allow header");
+        if ( is_null($allow) ) {
+            throw new Exception("Missing Allow header");
+        }
 
         parent::consolidate();
 

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

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         $type = $this->response()->content()->type();
         $charset = $this->response()->content()->charset();
 
-        if ( is_null($charset) ) {
+        if (is_null($charset)) {
             $this->response()->headers()->set("Content-type", strtolower($type));
         } else {
             $this->response()->headers()->set("Content-type", strtolower($type)."; charset=".$charset);