comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Router/Route.php

Spacing +6 added lines, -6 removed lines

@@ -72,7 +72,7 @@ 
 
     public function getServiceName() {
 
-        return (empty($this->service))?"default":implode('.', $this->service);
+        return (empty($this->service)) ? "default" : implode('.', $this->service);
 
     }
 
@@ -96,7 +96,7 @@ 
 
         $parameters = $this->parameters;
 
-        return (isset($parameters[$key]))?$parameters[$key]:null;
+        return (isset($parameters[$key])) ? $parameters[$key] : null;
 
     }
 
@@ -126,7 +126,7 @@ 
 
         $parameters = $this->request;
 
-        return (isset($parameters[$key]))?$parameters[$key]:null;
+        return (isset($parameters[$key])) ? $parameters[$key] : null;
 
     }
 
@@ -169,7 +169,7 @@ 
 
         $query = $this->query;
 
-        return isset($query[$key])?$query[$key]["required"]:false;
+        return isset($query[$key]) ? $query[$key]["required"] : false;
 
     }
 
@@ -177,7 +177,7 @@ 
 
         $query = $this->query;
 
-        return isset($query[$key])?$query[$key]["regex"]:null;
+        return isset($query[$key]) ? $query[$key]["regex"] : null;
 
     }
 
@@ -218,7 +218,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.
 

Doc Comments +5 added lines

@@ -87,6 +87,11 @@
 
     }
 
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
     public function getParameter($key) {
 
         $parameters = $this->parameters;

Braces +4 added lines, -1 removed lines

@@ -215,7 +215,10 @@
                  */
                 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.
+                    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->setRequestParameter($key, $matches);

src/Comodojo/Dispatcher/Request/File.php

Doc Comments +3 added lines

@@ -44,6 +44,9 @@
 
     }
 
+    /**
+     * @return string
+     */
     public function getTemporaryName() {
 
         return $this->tname;

Spacing +3 added lines, -3 removed lines

@@ -108,9 +108,9 @@ 
 
         if (!empty($this->path) && file_exists($this->path)) {
 
-            $local_name = "$this->path/" . ($as_slug ? $this->getSlug() : $this->getFileName());
+            $local_name = "$this->path/".($as_slug ? $this->getSlug() : $this->getFileName());
 
-            if ( file_exists($local_name) ) {
+            if (file_exists($local_name)) {
 
                 $files = glob("$local_name*");
 
@@ -120,7 +120,7 @@ 
 
             }
 
-            if ( move_uploaded_file($this->getTemporaryName(), $local_name) ) {
+            if (move_uploaded_file($this->getTemporaryName(), $local_name)) {
 
                 // return file_exists($local_name);
                 return true;

Braces +3 added lines, -1 removed lines

@@ -84,7 +84,9 @@
 
         $file = $this->getTemporaryName();
 
-        if (file_exists($file)) return file_get_contents($file);
+        if (file_exists($file)) {
+            return file_get_contents($file);
+        }
 
         throw new Exception("File does not exists");
 

src/Comodojo/Dispatcher/Events/DispatcherEvent.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
     protected $dispatcher;
 
-    public function __construct( Dispatcher $dispatcher ) {
+    public function __construct(Dispatcher $dispatcher) {
 
         parent::__construct('dispatcher');
 

src/Comodojo/Dispatcher/Components/HeadersTrait.php

Spacing +9 added lines, -9 removed lines

@@ -28,9 +28,9 @@ 
 
     public function get($header = null) {
 
-        if ( is_null($header) ) return $this->headers;
+        if (is_null($header)) return $this->headers;
 
-        else if ( array_key_exists($header, $this->headers) ) return $this->headers[$header];
+        else if (array_key_exists($header, $this->headers)) return $this->headers[$header];
 
         else return null;
 
@@ -38,14 +38,14 @@ 
 
     public function getAsString($header = null) {
 
-        if ( is_null($header) ) {
+        if (is_null($header)) {
 
-            return array_map( [$this, 'headerToString'],
+            return array_map([$this, 'headerToString'],
                 array_keys($this->headers),
                 array_values($this->headers)
             );
 
-        } else if ( array_key_exists($header, $this->headers) ) {
+        } else if (array_key_exists($header, $this->headers)) {
 
             return self::headerToString($header, $this->headers[$header]);
 
@@ -53,9 +53,9 @@ 
 
     }
 
-    public function set($header, $value=null) {
+    public function set($header, $value = null) {
 
-        if ( is_null($value) ) {
+        if (is_null($value)) {
 
             $header = explode(":", $header);
 
@@ -73,13 +73,13 @@ 
 
     public function delete($header = null) {
 
-        if ( is_null($header) ) {
+        if (is_null($header)) {
 
             $this->headers = array();
 
             return true;
 
-        } else if ( array_key_exists($header, $this->headers) ) {
+        } else if (array_key_exists($header, $this->headers)) {
 
             unset($this->headers[$header]);
 

Braces +10 added lines, -6 removed lines

@@ -28,11 +28,13 @@ 
 
     public function get($header = null) {
 
-        if ( is_null($header) ) return $this->headers;
-
-        else if ( array_key_exists($header, $this->headers) ) return $this->headers[$header];
-
-        else return null;
+        if ( is_null($header) ) {
+            return $this->headers;
+        } else if ( array_key_exists($header, $this->headers) ) {
+            return $this->headers[$header];
+        } else {
+            return null;
+        }
 
     }
 
@@ -49,7 +51,9 @@ 
 
             return self::headerToString($header, $this->headers[$header]);
 
-        } else return null;
+        } else {
+            return null;
+        }
 
     }
 

src/Comodojo/Dispatcher/Cache/ServerCache.php

Spacing +5 added lines, -5 removed lines

@@ -41,11 +41,11 @@ 
         Response $response
     ) {
 
-        $name = md5( (string) $request->method . (string) $request->uri );
+        $name = md5((string)$request->method.(string)$request->uri);
 
         $cache_object = $this->cache->setNamespace('dispatcherservice')->get($name);
 
-        if ( is_null($cache_object) ) return false;
+        if (is_null($cache_object)) return false;
 
         $response->import($cache_object);
 
@@ -63,17 +63,17 @@ 
 
         $ttl = $route->getParameter('ttl');
 
-        $name = md5( (string) $request->method . (string) $request->uri );
+        $name = md5((string)$request->method.(string)$request->uri);
 
         $method = $request->method->get();
 
         $status = $response->status->get();
 
         if (
-            ( $cache == 'SERVER' || $cache == 'BOTH' ) &&
+            ($cache == 'SERVER' || $cache == 'BOTH') &&
             in_array($method, self::$cachable_methods) &&
             in_array($status, self::$cachable_statuses)
-        ){
+        ) {
 
             $this->cache
                 ->setNamespace('dispatcherservice')

Braces +3 added lines, -1 removed lines

@@ -45,7 +45,9 @@
 
         $cache_object = $this->cache->setNamespace('dispatcherservice')->get($name);
 
-        if ( is_null($cache_object) ) return false;
+        if ( is_null($cache_object) ) {
+            return false;
+        }
 
         $response->import($cache_object);
 

src/Comodojo/Dispatcher/Dispatcher.php

Braces +3 added lines, -1 removed lines

@@ -192,7 +192,9 @@
 
         if ( !empty($params) && is_array($params) ) {
 
-            foreach($params as $name=>$value) $this->response->headers->set($name, $value);
+            foreach($params as $name=>$value) {
+                $this->response->headers->set($name, $value);
+            }
         }
 
     }

Spacing +17 added lines, -17 removed lines

@@ -74,7 +74,7 @@ 
 
         // init core components
         // create new configuration object and merge configuration
-        $configuration_object = new Configuration( DefaultConfiguration::get() );
+        $configuration_object = new Configuration(DefaultConfiguration::get());
         $configuration_object->merge($configuration);
         $logger = is_null($logger) ? LogManager::createFromConfiguration($configuration_object)->getLogger() : $logger;
 
@@ -95,7 +95,7 @@ 
             $this->setRaw('response', new Response($this->configuration, $this->logger));
 
         } catch (Exception $e) {
-            $this->logger->critical($e->getMessage(),$e->getTrace());
+            $this->logger->critical($e->getMessage(), $e->getTrace());
             throw $e;
         }
 
@@ -110,9 +110,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.");
 
@@ -130,13 +130,13 @@ 
 
         $cache = new ServerCache($this->cache);
 
-        $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.#'));
 
-        if ( $cache->read($this->request, $this->response) ) {
+        if ($cache->read($this->request, $this->response)) {
 
             return $this->shutdown();
 
@@ -164,13 +164,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
 
@@ -200,9 +200,9 @@ 
 
         $params = $route->getParameter('headers');
 
-        if ( !empty($params) && is_array($params) ) {
+        if (!empty($params) && is_array($params)) {
 
-            foreach($params as $name=>$value) $this->response->headers->set($name, $value);
+            foreach ($params as $name=>$value) $this->response->headers->set($name, $value);
         }
 
     }
@@ -242,11 +242,11 @@ 
 
         $this->response->consolidate($this->request, $this->route);
 
-        $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");
 

Doc Comments +3 added lines

@@ -207,6 +207,9 @@
 
     }
 
+    /**
+     * @param string $name
+     */
     private function emitServiceSpecializedEvents($name) {
 
         $this->logger->debug("Emitting $name service-event");

src/Comodojo/Dispatcher/Service/AbstractService.php

Spacing +6 added lines, -6 removed lines

@@ -62,9 +62,9 @@ 
 
         $supported_methods = $this->configuration->get('supported-http-methods');
 
-        if ( is_null($supported_methods) ) $supported_methods = array('GET','PUT','POST','DELETE','OPTIONS','HEAD','TRACE','CONNECT','PURGE');
+        if (is_null($supported_methods)) $supported_methods = array('GET', 'PUT', 'POST', 'DELETE', 'OPTIONS', 'HEAD', 'TRACE', 'CONNECT', 'PURGE');
 
-        if ( method_exists($this, 'any') ) {
+        if (method_exists($this, 'any')) {
 
             return $supported_methods;
 
@@ -72,9 +72,9 @@ 
 
         $implemented_methods = array();
 
-        foreach ( $supported_methods as $method ) {
+        foreach ($supported_methods as $method) {
 
-            if ( method_exists($this, strtolower($method)) ) array_push($implemented_methods,$method);
+            if (method_exists($this, strtolower($method))) array_push($implemented_methods, $method);
 
         }
 
@@ -88,11 +88,11 @@ 
      */
     public function getMethod($method) {
 
-        if ( method_exists($this, strtolower($method)) ) {
+        if (method_exists($this, strtolower($method))) {
 
             return strtolower($method);
 
-        } else if ( method_exists($this, strtolower('any')) ) {
+        } else if (method_exists($this, strtolower('any'))) {
 
             return 'any';
 

Braces +6 added lines, -2 removed lines

@@ -62,7 +62,9 @@ 
 
         $supported_methods = $this->configuration->get('supported-http-methods');
 
-        if ( is_null($supported_methods) ) $supported_methods = array('GET','PUT','POST','DELETE','OPTIONS','HEAD','TRACE','CONNECT','PURGE');
+        if ( is_null($supported_methods) ) {
+            $supported_methods = array('GET','PUT','POST','DELETE','OPTIONS','HEAD','TRACE','CONNECT','PURGE');
+        }
 
         if ( method_exists($this, 'any') ) {
 
@@ -74,7 +76,9 @@ 
 
         foreach ( $supported_methods as $method ) {
 
-            if ( method_exists($this, strtolower($method)) ) array_push($implemented_methods,$method);
+            if ( method_exists($this, strtolower($method)) ) {
+                array_push($implemented_methods,$method);
+            }
 
         }
 

src/Comodojo/Dispatcher/Request/Query.php

Spacing +1 added lines, -1 removed lines

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

src/Comodojo/Dispatcher/Router/Table.php

Spacing +8 added lines, -8 removed lines

@@ -127,9 +127,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']);
                 // $this->add($name, $route['type'], $route['class'], $route['parameters']);
@@ -147,11 +147,11 @@ 
 
     private function readCache() {
 
-        if ( $this->configuration->get('routing-table-cache') !== true ) return;
+        if ($this->configuration->get('routing-table-cache') !== true) return;
 
         $data = $this->cache->read();
 
-        if ( is_null($data) ) {
+        if (is_null($data)) {
 
             $this->routes = [];
 
@@ -167,11 +167,11 @@ 
 
     private function dumpCache() {
 
-        if ( $this->configuration->get('routing-table-cache') !== true ) return;
+        if ($this->configuration->get('routing-table-cache') !== true) return;
 
         $ttl = $this->configuration->get('routing-table-ttl');
 
-        if ( $this->cache->dump($this->routes, $ttl) ) {
+        if ($this->cache->dump($this->routes, $ttl)) {
             $this->logger->debug("Routing table saved to cache");
         } else {
             $this->logger->warning("Cannot save routing table to cache");
@@ -188,14 +188,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 +11 added lines, -6 removed lines

@@ -84,10 +84,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;
+        }
 
     }
 
@@ -147,7 +148,9 @@ 
 
     private function readCache() {
 
-        if ( $this->configuration->get('routing-table-cache') !== true ) return;
+        if ( $this->configuration->get('routing-table-cache') !== true ) {
+            return;
+        }
 
         $data = $this->cache->read();
 
@@ -167,7 +170,9 @@ 
 
     private function dumpCache() {
 
-        if ( $this->configuration->get('routing-table-cache') !== true ) return;
+        if ( $this->configuration->get('routing-table-cache') !== true ) {
+            return;
+        }
 
         $ttl = $this->configuration->get('routing-table-ttl');