comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Output/HttpStatus/Status204.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
         header($_SERVER["SERVER_PROTOCOL"].' 204 No Content');
         header('Status: 204 No Content');
-        header('Content-Length: 0',true);
+        header('Content-Length: 0', true);
 
         $this->response()->content()->set(null);
 

src/Comodojo/Dispatcher/Output/HttpStatus/Status201.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     public function consolidate() {
 
-        header("Location: ".$this->response()->location()->get(),true,$this->response()->status()->get());
+        header("Location: ".$this->response()->location()->get(), true, $this->response()->status()->get());
 
     }
 

src/Comodojo/Dispatcher/Output/HttpStatus/Status405.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
         // An Allow Header should be prvided from DispatcherException
         $allowed = $this->response()->headers()->get('Allow');
 
-        if ( is_null($allowed) ) {
+        if (is_null($allowed)) {
 
             header('Method not allowed', true, 405);
 

src/Comodojo/Dispatcher/Output/HttpStatus/Status501.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
         // An Allow Header should be prvided from DispatcherException
         $allowed = $this->response()->headers()->get('Allow');
 
-        if ( is_null($allowed) ) {
+        if (is_null($allowed)) {
 
             header('Method not allowed', true, 405);
 

src/Comodojo/Dispatcher/Router/Parser.php

Spacing +5 added lines, -5 removed lines

@@ -73,9 +73,9 @@ 
                  */
                 foreach ($decoded as $key => $string) {
 
-                    $this->logger->debug("PARAMETER KEY: " . $key);
+                    $this->logger->debug("PARAMETER KEY: ".$key);
 
-                    $this->logger->debug("PARAMETER STRING: " . $string);
+                    $this->logger->debug("PARAMETER STRING: ".$string);
                     
                     /* The key and the regex of every paramater is passed to the 'param'
                      * method which will build an appropriate regular expression and will understand 
@@ -83,14 +83,14 @@ 
                      */
                     $param_regex .= $this->param($key, $string, $param_required, $value);
 
-                    $this->logger->debug("PARAMETER REGEX: " . $param_regex);
+                    $this->logger->debug("PARAMETER REGEX: ".$param_regex);
 
                 }
                 // Once the parameter is analyzed, the result is passed to the next iteration
                 return $this->read(
                     $folders,
                     $value,
-                    $regex.'(?:\/'.$param_regex.')'. (($param_required)?'{1}':'?')
+                    $regex.'(?:\/'.$param_regex.')'.(($param_required) ? '{1}' : '?')
                 );
 
             } else {
@@ -155,7 +155,7 @@ 
          * If the field is required, the regular expression is completed with a '{1}' (which make it compulsory),
          * otherwise a '?' is added.
          */
-        return '(?P<' . $key . '>' . $string . ')' . (($field_required)?'{1}':'?');
+        return '(?P<'.$key.'>'.$string.')'.(($field_required) ? '{1}' : '?');
 
     }
 

Braces +3 added lines, -1 removed lines

@@ -103,7 +103,9 @@
                      */
                     $param_regex .= $this->param($key, $string, $value);
                     
-                    if ($value->isQueryRequired($key)) $param_required = true;
+                    if ($value->isQueryRequired($key)) {
+                        $param_required = true;
+                    }
 
                     $this->logger->debug("PARAMETER REGEX: " . $param_regex);
 

src/Comodojo/Dispatcher/Router/Route.php

Spacing +5 added lines, -5 removed lines

@@ -81,7 +81,7 @@ 
 
     public function getServiceName() {
 
-        return (empty($this->service))?"default":implode('.', $this->service);
+        return (empty($this->service)) ? "default" : implode('.', $this->service);
 
     }
 
@@ -103,7 +103,7 @@ 
 
     public function getParameter($key) {
         
-        return (isset($this->parameters[$key]))?$this->parameters[$key]:null;
+        return (isset($this->parameters[$key])) ? $this->parameters[$key] : null;
 
     }
 
@@ -142,13 +142,13 @@ 
     
     public function isQueryRequired($key) {
         
-        return isset($this->query[$key])?$this->query[$key]["required"]:false;
+        return isset($this->query[$key]) ? $this->query[$key]["required"] : false;
         
     }
     
     public function getQueryRegex($key) {
         
-        return isset($this->query[$key])?$this->query[$key]["regex"]:null;
+        return isset($this->query[$key]) ? $this->query[$key]["regex"] : null;
         
     }
     
@@ -220,7 +220,7 @@ 
                 /* if it's available a bit associated with the parameter name, it is compared against
                  * it's regular expression in order to extrect backreferences
                  */
-                if (preg_match('/^' . $value['regex'] . '$/', $path[$key], $matches)) {
+                if (preg_match('/^'.$value['regex'].'$/', $path[$key], $matches)) {
                     
                     if (count($matches) == 1) $matches = $matches[0]; // This is the case where no backreferences are present or available.
                     

Braces +6 added lines, -2 removed lines

@@ -113,8 +113,9 @@ 
                 $this->extra
             );
 
+        } else {
+            return null;
         }
-        else return null;
 
     }
 
@@ -294,7 +295,10 @@ 
                  */
                 if (preg_match('/^' . $value['regex'] . '$/', $bits[$key], $matches)) {
                     
-                    if (count($matches) == 1) $matches = $matches[0]; // This is the case where no backreferences are present or available.
+                    if (count($matches) == 1) {
+                        $matches = $matches[0];
+                    }
+                    // This is the case where no backreferences are present or available.
                     
                     // The extracted value (with any backreference available) is added to the query parameters.
                     $this->request->query()->set($key, $matches);

src/Comodojo/Dispatcher/Router/Model.php

Braces +3 added lines, -1 removed lines

@@ -104,7 +104,9 @@
 
         if (!$this->bypass) {
             
-            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);
+            }
 
         }
         

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

src/Comodojo/Dispatcher/Components/CacheManager.php

Spacing +10 added lines, -10 removed lines

@@ -29,31 +29,31 @@ 
  * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */

 

-class CacheManager extends DispatcherClassModel{

+class CacheManager extends DispatcherClassModel {

 

     public function init() {

 

         $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;

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);
+                    }
 

                 }

 

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);
+                }
 
             }