comodojo / dispatcher.framework

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/Router/Collector.php

Braces +9 added lines, -3 removed lines

@@ -113,8 +113,9 @@ 
                 $this->extra
             );
 
+        } else {
+            return null;
         }
-        else return null;
 
     }
 
@@ -250,7 +251,9 @@ 
         
         $routes = $this->cache->get("dispatcher_routes");
         
-        if (is_null($routes)) return null;
+        if (is_null($routes)) {
+            return null;
+        }
         
         $this->table->routes($routes);
         
@@ -317,7 +320,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);