comodojo / dispatcher.framework

src/Response/Content.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
 
     public function set($content) {
 
-        if ( !is_scalar($content) ) {
+        if (!is_scalar($content)) {
 
             throw new Exception("Invalid HTTP content");
 
@@ -54,7 +54,7 @@ 
 
     public function type($type = null) {
 
-        if ( is_null($type) ) {
+        if (is_null($type)) {
 
             return $this->type;
 
@@ -68,7 +68,7 @@ 
 
     public function charset($charset = null) {
 
-        if ( is_null($charset) ) {
+        if (is_null($charset)) {
 
             return $this->charset;
 

src/Response/Status.php

Spacing +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
 
     public function set($code) {
 
-        if ( !array_key_exists($code, $this->http_status_codes) ) {
+        if (!array_key_exists($code, $this->http_status_codes)) {
 
             throw new Exception("Invalid HTTP Status Code");
 
@@ -97,9 +97,9 @@ 
 
     }
 
-    public function description($code=null) {
+    public function description($code = null) {
 
-        if ( is_null($code) || !array_key_exists($code, $this->http_status_codes) ) {
+        if (is_null($code) || !array_key_exists($code, $this->http_status_codes)) {
 
             $message = $this->http_status_codes[$this->status_code];
 

src/Router/RoutingTable.php

Braces +6 added lines, -3 removed lines

@@ -46,8 +46,9 @@ 
             "query"      => array()
         );
         
-        if (count($folders) > 1 && empty($folders[0]))
-            array_shift($folders);
+        if (count($folders) > 1 && empty($folders[0])) {
+                    array_shift($folders);
+        }
         
         if (count($folders) == 1 && empty($folders[0])) {
             $this->def_route = $value;
@@ -67,7 +68,9 @@ 
         
         $regex = $this->readpath($folders);
         
-        if (isset($this->routes[$regex])) unset($this->routes[$regex]);
+        if (isset($this->routes[$regex])) {
+            unset($this->routes[$regex]);
+        }
         
     }
     

Spacing +2 added lines, -2 removed lines

@@ -124,14 +124,14 @@
                     $value = preg_replace('/(?<!\\)\((?!\?)/', '(?:', $value);
                     $value = preg_replace('/\.([\*\+])(?!\?)/', '.\${1}?', $value);
                     
-                    $param_regex .= '(?P<' . $key . '>' . $value . ')' . (($field_required)?'{1}':'?');
+                    $param_regex .= '(?P<'.$key.'>'.$value.')'.(($field_required) ? '{1}' : '?');
                     
                 }
                 
                 $this->readpath( 
                     $folders,
                     $value,
-                    $regex.'(?:\/'.$param_regex.')'. (($param_required)?'{1}':'?')
+                    $regex.'(?:\/'.$param_regex.')'.(($param_required) ? '{1}' : '?')
                 );
                 
             } else {

src/Router/Collector.php

Doc Comments +7 added lines

@@ -47,6 +47,10 @@ 
 
     private $table      = array();
 
+    /**
+     * @param \Comodojo\Dispatcher\Components\Configuration $routing_table
+     * @param \Comodojo\Cache\CacheManager $logger
+     */
     public function __construct($routing_table, $configuration = null, $logger = null, $cache = null) {
 
         parent::__construct($configuration, $logger);
@@ -173,6 +177,9 @@ 
         
     }
     
+    /**
+     * @param string[] $bits
+     */
     private function evalUri($parameters, $bits) {
         
         $count  = 0;

Spacing +3 added lines, -3 removed lines

@@ -149,7 +149,7 @@ 
         
         foreach ($this->table as $regex => $value) {
             
-            if (preg_match("/" . $regex . "/", $path, $matches)) {
+            if (preg_match("/".$regex."/", $path, $matches)) {
                 
                 $this->evalUri($value['query'], $matches);
                 
@@ -175,13 +175,13 @@ 
     
     private function evalUri($parameters, $bits) {
         
-        $count  = 0;
+        $count = 0;
         
         foreach ($parameters as $key => $value) {
             
             if (isset($bits[$key])) {
                 
-                if (preg_match('/' . $value['regex'] . '/', $bits[$key], $matches)) {
+                if (preg_match('/'.$value['regex'].'/', $bits[$key], $matches)) {
                     
                     if (count($matches) == 1) $matches = $matches[0];
                     

Braces +5 added lines, -2 removed lines

@@ -96,8 +96,9 @@ 
                 $this->response
             );
             
+        } else {
+            return null;
         }
-        else return null;
         
     }
 
@@ -183,7 +184,9 @@ 
                 
                 if (preg_match('/' . $value['regex'] . '/', $bits[$key], $matches)) {
                     
-                    if (count($matches) == 1) $matches = $matches[0];
+                    if (count($matches) == 1) {
+                        $matches = $matches[0];
+                    }
                     
                     $this->request->query()->set($key, $matches);
                     

src/Request/Query.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
     private static function getParameters() {
 
-        switch( $_SERVER['REQUEST_METHOD'] ) {
+        switch ($_SERVER['REQUEST_METHOD']) {
 
             case 'POST':
 

src/Dispatcher.php

Doc Comments +3 added lines

@@ -167,6 +167,9 @@
 
     }
 
+    /**
+     * @param string $name
+     */
     private function emitServiceSpecializedEvents($name) {
 
         return new ServiceEvent(

Spacing +13 added lines, -13 removed lines

@@ -73,7 +73,7 @@ 
         
         $this->logger = is_null($logger) ? DispatcherLogger::create($this->configuration) : $logger;
         
-        $this->cache = is_null($cache) ? new CacheManager( CacheManager::PICK_FIRST, $this->logger ) : $cache;
+        $this->cache = is_null($cache) ? new CacheManager(CacheManager::PICK_FIRST, $this->logger) : $cache;
         
         $this->request = new Request($this->configuration, $this->logger);
         
@@ -83,7 +83,7 @@ 
         
         $this->extra = new Extra($this->logger);
         
-        $this->router->load( $routing_table );
+        $this->router->load($routing_table);
 
     }
 
@@ -131,33 +131,33 @@ 
 
     public function dispatch() {
 
-        $this->events->emit( new DispatcherEvent($this) );
+        $this->events->emit(new DispatcherEvent($this));
 
-        $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->router->route($this->request);
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.route') );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.route'));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.route.'.$this->router->getType()) );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.route.'.$this->router->getType()));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.route.'.$this->router->getService()) );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.route.'.$this->router->getService()));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.route.#') );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.route.#'));
 
         // translate route to service
 
         $this->router->compose($this->response);
 
-        $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.#'));
 
         $return = Processor::parse($this->configuration, $this->logger, $this->response);