comodojo / dispatcher.framework

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

Spacing +5 added lines, -5 removed lines

@@ -150,9 +150,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']);
 
@@ -190,7 +190,7 @@ 
         
         $routes = array();
         
-        foreach($this->routes as $name => $route) {
+        foreach ($this->routes as $name => $route) {
             
             $routes[$name] = $route->getData();
             
@@ -213,14 +213,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 +8 added lines, -5 removed lines

@@ -85,10 +85,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;
+        }
 
     }
 
@@ -160,7 +161,9 @@ 
         
         $routes = $this->cache->get("dispatcher_routes");
         
-        if (is_null($routes)) return null;
+        if (is_null($routes)) {
+            return null;
+        }
         
         foreach ($routes as $name => $data) {
             

src/Comodojo/Dispatcher/Router/Model.php

Spacing +4 added lines, -4 removed lines

@@ -92,10 +92,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)
             ));
 
         }
@@ -136,7 +136,7 @@ 
 
             $methods = $service->getImplementedMethods();
 
-            if ( in_array($method, $methods) ) {
+            if (in_array($method, $methods)) {
 
                 $callable = $service->getMethod($method);
 
@@ -179,7 +179,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 +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);
+            }
 
         }
         

src/Comodojo/Dispatcher/Components/EventsManager.php

Spacing +7 added lines, -7 removed lines

@@ -44,7 +44,7 @@ 
 
     public function subscribe($event, $class, $method = null, $priority = 0) {
 
-        $callable = ( is_null($method) ) ? $class : array($class, $method);
+        $callable = (is_null($method)) ? $class : array($class, $method);
 
         $this->logger->debug("Subscribing handler $calss to event $event", array(
             "CALLABLE" => $callable,
@@ -57,7 +57,7 @@ 
 
     public function subscribeOnce($event, $class, $method = null, $priority = 0) {
 
-        $callable = ( is_null($method) ) ? $class : array($class, $method);
+        $callable = (is_null($method)) ? $class : array($class, $method);
 
         $this->logger->debug("Subscribing once handler $calss to event $event", array(
             "CALLABLE" => $callable,
@@ -70,7 +70,7 @@ 
 
     public function unsubscribe($event, $class = null, $method = null) {
 
-        if ( is_null($class) ) {
+        if (is_null($class)) {
 
             $this->logger->debug("Unsubscribing all handlers from event $event");
 
@@ -78,7 +78,7 @@ 
 
         } else {
 
-            $callable = ( is_null($method) ) ? $class : array($class, $method);
+            $callable = (is_null($method)) ? $class : array($class, $method);
 
             $this->logger->debug("Unsubscribing handler $calss from event $event", array(
                 "CALLABLE" => $callable
@@ -92,11 +92,11 @@ 
 
     public function load($plugins) {
 
-        if ( !empty($plugins) ) {
+        if (!empty($plugins)) {
 
-            foreach( $plugins as $name => $event ) {
+            foreach ($plugins as $name => $event) {
 
-                $callable = ( is_null($event['method']) ) ? $event["class"] : array($event["class"], $event["method"]);
+                $callable = (is_null($event['method'])) ? $event["class"] : array($event["class"], $event["method"]);
 
                 $this->addListener($event["event"], $callable, $event["priority"]);
 

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

                 }