comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Router/RoutingTable.php

Spacing +13 added lines, -13 removed lines

@@ -142,9 +142,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 'readparam'
                      * method which will build an appropriate regular expression and will understand 
@@ -152,14 +152,14 @@ 
                      */
                     $param_regex .= $this->readparam($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->readpath(
                     $folders,
                     $value,
-                    $regex.'(?:\/'.$param_regex.')'. (($param_required)?'{1}':'?')
+                    $regex.'(?:\/'.$param_regex.')'.(($param_required) ? '{1}' : '?')
                 );
 
             } else {
@@ -224,7 +224,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}' : '?');
 
     }
 
@@ -232,24 +232,24 @@ 
     private function add($folders, $type, $class, $parameters) {
 
         // The values associated with a route are as follows:
-        $value   = array(
-            "type"       => $type,       // Type of route
-            "class"      => $class,      // Class to be invoked
-            "service"    => array(),     // Service name (it can be a list of namespaces plus a final service name)
+        $value = array(
+            "type"       => $type, // Type of route
+            "class"      => $class, // Class to be invoked
+            "service"    => array(), // Service name (it can be a list of namespaces plus a final service name)
             "parameters" => $parameters, // Parameters passed via the composer.json configuration (cache, ttl, etc...)
             "query"      => array()      // List of parameters with their regular expression that must be added among the query parameters
         );
 
-        $this->logger->debug("ROUTE: " . implode("/", $folders));
+        $this->logger->debug("ROUTE: ".implode("/", $folders));
 
-        $this->logger->debug("PARAMETERS: " . var_export($value, true));
+        $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->readpath($folders, $value);
 
-        $this->logger->debug("ROUTE: " . $regex);
+        $this->logger->debug("ROUTE: ".$regex);
 
-        $this->logger->debug("PARAMETERS: " . var_export($value, true));
+        $this->logger->debug("PARAMETERS: ".var_export($value, true));
 
         $this->routes[$regex] = $value;
 

Braces +11 added lines, -6 removed lines

@@ -70,10 +70,11 @@ 
 
         $regex = $this->readpath($folders);
 
-        if (isset($this->routes[$regex]))
-            return $this->routes[$regex];
-        else
-            return null;
+        if (isset($this->routes[$regex])) {
+                    return $this->routes[$regex];
+        } else {
+                    return null;
+        }
 
     }
 
@@ -83,7 +84,9 @@ 
 
         $regex = $this->readpath($folders);
 
-        if (isset($this->routes[$regex])) unset($this->routes[$regex]);
+        if (isset($this->routes[$regex])) {
+            unset($this->routes[$regex]);
+        }
 
     }
 
@@ -164,7 +167,9 @@ 
 
             } else {
                 // if the element is not a json string, I assume it's the service name
-                if (!isset($value['service'])) $value['service'] = array();
+                if (!isset($value['service'])) {
+                    $value['service'] = array();
+                }
                 array_push($value['service'], $folder);
 
                 return $this->readpath(

src/Comodojo/Dispatcher/Dispatcher.php

Doc Comments +18 added lines

@@ -95,6 +95,9 @@ 
         
     }
 
+    /**
+     * @return Configuration
+     */
     public function configuration() {
         
         if (empty($this->configuration)) {
@@ -131,6 +134,9 @@ 
 
     }
 
+    /**
+     * @return Request
+     */
     public function request() {
         
         if (empty($this->request)) {
@@ -143,6 +149,9 @@ 
 
     }
 
+    /**
+     * @return RouteCollector
+     */
     public function router() {
         
         if (empty($this->router)) {
@@ -155,6 +164,9 @@ 
 
     }
 
+    /**
+     * @return Response
+     */
     public function response() {
         
         if (empty($this->response)) {
@@ -167,6 +179,9 @@ 
 
     }
 
+    /**
+     * @return null|Extra
+     */
     public function extra() {
         
         if (empty($this->extra)) {
@@ -273,6 +288,9 @@ 
 
     }
 
+    /**
+     * @param string $name
+     */
     private function emitServiceSpecializedEvents($name) {
 
         $this->logger()->debug("Emitting $name service-event.");

Spacing +13 added lines, -13 removed lines

@@ -99,7 +99,7 @@ 
         
         if (empty($this->configuration)) {
             
-            $this->configuration = new Configuration( DefaultConfiguration::get() );
+            $this->configuration = new Configuration(DefaultConfiguration::get());
             
         }
 
@@ -199,9 +199,9 @@ 
 
         $this->logger()->debug("Emitting global dispatcher event.");
 
-        $this->events()->emit( new DispatcherEvent($this) );
+        $this->events()->emit(new DispatcherEvent($this));
 
-        if ( $this->configuration()->get('enabled') === false ) {
+        if ($this->configuration()->get('enabled') === false) {
 
             $this->logger()->debug("Dispatcher disabled, shutting down gracefully.");
 
@@ -217,11 +217,11 @@ 
 
         }
 
-        $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.request') );
+        $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.request'));
 
-        $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.request.'.$this->request()->method()->get()) );
+        $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.request.'.$this->request()->method()->get()));
 
-        $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.request.#') );
+        $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.request.#'));
 
         $this->logger()->debug("Starting router.");
 
@@ -245,13 +245,13 @@ 
 
         $this->logger()->debug("Route acquired, type $route_type directed to $route_service.");
 
-        $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.route') );
+        $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.route'));
 
-        $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.route.'.$route_type) );
+        $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.route.'.$route_type));
 
-        $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.route.'.$route_service) );
+        $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.route.'.$route_service));
 
-        $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.route.#') );
+        $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.route.#'));
 
         // translate route to service
 
@@ -307,11 +307,11 @@ 
 
     private function shutdown() {
 
-        $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.response') );
+        $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.response'));
 
-        $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.response.'.$this->response()->status()->get()) );
+        $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.response.'.$this->response()->status()->get()));
 
-        $this->events()->emit( $this->emitServiceSpecializedEvents('dispatcher.response.#') );
+        $this->events()->emit($this->emitServiceSpecializedEvents('dispatcher.response.#'));
 
         $this->logger()->debug("Composing return value.");
 

src/Comodojo/Dispatcher/Events/EventsManager.php

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,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);
 
         return $this->addListener($event, $callable, $priority);
 
@@ -37,7 +37,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);
 
         return $this->addOneTimeListener($event, $callable, $priority);
 
@@ -45,11 +45,11 @@ 
 
     public function loadPlugins($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"]);