comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Dispatcher.php

Doc Comments +9 added lines

@@ -251,6 +251,9 @@ 
         
     }
     
+    /**
+     * @param Router\Route $route
+     */
     private function dumpCache($route) {
         
         $cache = strtoupper($route->getParameter('cache'));
@@ -281,6 +284,9 @@ 
        
     }
     
+    /**
+     * @param Router\Route $route
+     */
     private function processConfigurationParameters($route) {
         
         $params = $route->getParameter('headers');
@@ -292,6 +298,9 @@ 
         
     }
 
+    /**
+     * @param string $name
+     */
     private function emitServiceSpecializedEvents($name) {
 
         $this->logger()->debug("Emitting $name service-event.");

Spacing +26 added lines, -26 removed lines

@@ -74,7 +74,7 @@ 
         $this->setTimestamp();
 
         // parsing configuration
-        $this->configuration = new Configuration( DefaultConfiguration::get() );
+        $this->configuration = new Configuration(DefaultConfiguration::get());
 
         $this->configuration()->merge($configuration);
 
@@ -153,9 +153,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.");
 
@@ -171,13 +171,13 @@ 
 
         }
 
-        $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 ( $this->readCache() ) {
+        if ($this->readCache()) {
             
             return $this->shutdown();
             
@@ -205,13 +205,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
 
@@ -239,11 +239,11 @@ 
 
     private function readCache() {
         
-        $name = (string) $this->request()->uri();
+        $name = (string)$this->request()->uri();
         
         $cache = $this->cache()->setNamespace('dispatcher-service')->get($name);
         
-        if ( is_null($cache) ) return false;
+        if (is_null($cache)) return false;
         
         $this->response = $cache;
         
@@ -255,25 +255,25 @@ 
         
         $cache = strtoupper($route->getParameter('cache'));
         $ttl = $route->getParameter('ttl');
-        $name = (string) $this->request()->uri();
+        $name = (string)$this->request()->uri();
         
-        if ( $cache == 'CLIENT' || $cache == 'BOTH' ) {
+        if ($cache == 'CLIENT' || $cache == 'BOTH') {
             
-            if ( $ttl > 0 ) {
+            if ($ttl > 0) {
                 
-                $this->response()->headers()->set("Cache-Control","max-age=".$ttl.", must-revalidate");
-                $this->response()->headers()->set("Expires",gmdate("D, d M Y H:i:s", (int)$this->request()->getTimestamp() + $ttl)." GMT");
+                $this->response()->headers()->set("Cache-Control", "max-age=".$ttl.", must-revalidate");
+                $this->response()->headers()->set("Expires", gmdate("D, d M Y H:i:s", (int)$this->request()->getTimestamp()+$ttl)." GMT");
                 
             } else {
                 
-                $this->response()->headers()->set("Cache-Control","no-cache, must-revalidate");
-                $this->response()->headers()->set("Expires","Mon, 26 Jul 1997 05:00:00 GMT");
+                $this->response()->headers()->set("Cache-Control", "no-cache, must-revalidate");
+                $this->response()->headers()->set("Expires", "Mon, 26 Jul 1997 05:00:00 GMT");
                 
             }
             
         }
         
-        if ( $cache == 'SERVER' || $cache == 'BOTH' ) {
+        if ($cache == 'SERVER' || $cache == 'BOTH') {
             
             $this->cache()->setNamespace('dispatcher-service')->set($name, $this->response(), $ttl);
             
@@ -285,9 +285,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);
         }
         
     }
@@ -326,11 +326,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.");
 

Braces +6 added lines, -2 removed lines

@@ -243,7 +243,9 @@ 
         
         $cache = $this->cache()->setNamespace('dispatcher-service')->get($name);
         
-        if ( is_null($cache) ) return false;
+        if ( is_null($cache) ) {
+            return false;
+        }
         
         $this->response = $cache;
         
@@ -287,7 +289,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);
+            }
         }
         
     }

src/Comodojo/Dispatcher/Router/Table.php

Spacing +7 added lines, -7 removed lines

@@ -139,9 +139,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']);
 
@@ -157,7 +157,7 @@ 
     
     private function readCache() {
         
-        if ( $this->configuration()->get('routing-table-cache') !== true ) return;
+        if ($this->configuration()->get('routing-table-cache') !== true) return;
         
         $routes = $this->cache->setNamespace('dispatcher-internals')->get("dispatcher-routes");
         
@@ -177,13 +177,13 @@ 
     
     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');
         
         $routes = array();
         
-        foreach($this->routes as $name => $route) {
+        foreach ($this->routes as $name => $route) {
             
             $routes[$name] = $route->getData();
             
@@ -204,14 +204,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 +14 added lines, -7 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;
+        }
 
     }
 
@@ -157,11 +158,15 @@ 
     
     private function readCache() {
         
-        if ( $this->configuration()->get('routing-table-cache') !== true ) return;
+        if ( $this->configuration()->get('routing-table-cache') !== true ) {
+            return;
+        }
         
         $routes = $this->cache->setNamespace('dispatcher-internals')->get("dispatcher-routes");
         
-        if (is_null($routes)) return;
+        if (is_null($routes)) {
+            return;
+        }
         
         foreach ($routes as $name => $data) {
             
@@ -177,7 +182,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');
         

src/Comodojo/Dispatcher/Router/Model.php

Spacing +5 added lines, -5 removed lines

@@ -108,10 +108,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)
             ));
 
         }
@@ -138,7 +138,7 @@ 
             
         }
         
-        if ( $this->bypass_service ) {
+        if ($this->bypass_service) {
             
             return;
             
@@ -158,7 +158,7 @@ 
 
             $methods = $service->getImplementedMethods();
 
-            if ( in_array($method, $methods) ) {
+            if (in_array($method, $methods)) {
 
                 $callable = $service->getMethod($method);
 
@@ -201,7 +201,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

src/Comodojo/Dispatcher/Output/Processor.php

Spacing +5 added lines, -5 removed lines

@@ -72,7 +72,7 @@ 
 
     private $response;
 
-    public function __construct(Configuration $configuration,LoggerInterface $logger, Response $response) {
+    public function __construct(Configuration $configuration, LoggerInterface $logger, Response $response) {
 
         parent::__construct($configuration, $logger);
 
@@ -86,7 +86,7 @@ 
 
         $output_class_name = "\\Comodojo\\Dispatcher\\Output\\HttpStatus\\Status".$status;
 
-        if ( class_exists($output_class_name) ) {
+        if (class_exists($output_class_name)) {
 
             $output = new $output_class_name($this->response);
 
@@ -123,10 +123,10 @@ 
         $type = $this->response->content()->type();
         $charset = $this->response->content()->charset();
 
-        if ( is_null($charset) ) {
-            $this->response->headers()->set("Content-type",strtolower($type));
+        if (is_null($charset)) {
+            $this->response->headers()->set("Content-type", strtolower($type));
         } else {
-            $this->response->headers()->set("Content-type",strtolower($type)."; charset=".$charset);
+            $this->response->headers()->set("Content-type", strtolower($type)."; charset=".$charset);
         }
 
     }

src/Comodojo/Dispatcher/Service/AbstractService.php

Spacing +6 added lines, -6 removed lines

@@ -96,9 +96,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');
+        if (is_null($supported_methods)) $supported_methods = array('GET', 'PUT', 'POST', 'DELETE', 'OPTIONS', 'HEAD', 'TRACE', 'CONNECT');
 
-        if ( method_exists($this, 'any') ) {
+        if (method_exists($this, 'any')) {
 
             return $supported_methods;
 
@@ -106,9 +106,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);
 
         }
 
@@ -122,11 +122,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

@@ -96,7 +96,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');
+        if ( is_null($supported_methods) ) {
+            $supported_methods = array('GET','PUT','POST','DELETE','OPTIONS','HEAD','TRACE','CONNECT');
+        }
 
         if ( method_exists($this, 'any') ) {
 
@@ -108,7 +110,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/Components/LogManager.php

Spacing +16 added lines, -16 removed lines

@@ -47,13 +47,13 @@ 
 

         if (

             empty($log) ||

-            ( isset($log['enabled']) && $log['enabled'] === false ) ||

+            (isset($log['enabled']) && $log['enabled'] === false) ||

             empty($log['providers'])

         ) {

 

             $logger = new Logger('dispatcher');

 

-            $logger->pushHandler( new NullHandler( self::getLevel() ) );

+            $logger->pushHandler(new NullHandler(self::getLevel()));

 

         } else {

 

@@ -65,7 +65,7 @@ 
 

                 $handler = $this->getHandler($provider, $parameters);

 

-                if ( $handler instanceof HandlerInterface ) $logger->pushHandler($handler);

+                if ($handler instanceof HandlerInterface) $logger->pushHandler($handler);

 

             }

 

@@ -92,19 +92,19 @@ 
 

     protected function getHandler($provider, $parameters) {

 

-        switch ( strtolower($parameters['type']) ) {

+        switch (strtolower($parameters['type'])) {

 

             case 'StreamHandler':

                 

                 $stream = $this->configuration->get('base-path').'/'.(empty($parameters['stream']) ? 'dispatcher.log' : $parameters['stream']);

 

-                $level = self::getLevel( empty($parameters['level']) ? null : $parameters['level'] );

+                $level = self::getLevel(empty($parameters['level']) ? null : $parameters['level']);

                 

-                $bubble = self::getBubble( empty($parameters['bubble']) ? true : $parameters['bubble'] );

+                $bubble = self::getBubble(empty($parameters['bubble']) ? true : $parameters['bubble']);

                 

-                $filePermission = self::getFilePermission( empty($parameters['filePermission']) ? null : $parameters['filePermission'] );

+                $filePermission = self::getFilePermission(empty($parameters['filePermission']) ? null : $parameters['filePermission']);

                 

-                $useLocking = self::getLocking( empty($parameters['useLocking']) ? false : $parameters['useLocking'] );

+                $useLocking = self::getLocking(empty($parameters['useLocking']) ? false : $parameters['useLocking']);

 

                 $handler = new StreamHandler($stream, $level, $bubble, $filePermission, $useLocking);

 

@@ -112,13 +112,13 @@ 
                 

             case 'SyslogHandler':

                 

-                if ( empty($parameters['ident']) ) return null;

+                if (empty($parameters['ident'])) return null;

                 

                 $facility = empty($parameters['facility']) ? LOG_USER : $parameters['facility'];

             

-                $level = self::getLevel( empty($parameters['level']) ? null : $parameters['level'] );

+                $level = self::getLevel(empty($parameters['level']) ? null : $parameters['level']);

             

-                $bubble = self::getBubble( empty($parameters['bubble']) ? true : $parameters['bubble'] );

+                $bubble = self::getBubble(empty($parameters['bubble']) ? true : $parameters['bubble']);

             

                 $logopts = empty($parameters['logopts']) ? LOG_PID : $parameters['logopts'];

             

@@ -130,11 +130,11 @@ 
                 

                 $messageType = empty($parameters['messageType']) ? ErrorLogHandler::OPERATING_SYSTEM : $parameters['messageType'];

                 

-                $level = self::getLevel( empty($parameters['level']) ? null : $parameters['level'] );

+                $level = self::getLevel(empty($parameters['level']) ? null : $parameters['level']);

                 

-                $bubble = self::getBubble( empty($parameters['bubble']) ? true : $parameters['bubble'] );

+                $bubble = self::getBubble(empty($parameters['bubble']) ? true : $parameters['bubble']);

                 

-                $expandNewlines = self::getExpandNewlines( empty($parameters['expandNewlines']) ? false : $parameters['expandNewlines'] );

+                $expandNewlines = self::getExpandNewlines(empty($parameters['expandNewlines']) ? false : $parameters['expandNewlines']);

                 

                 $handler = new ErrorLogHandler($messageType, $level, $bubble, $expandNewlines);

                 

@@ -158,7 +158,7 @@ 
      */

     protected static function getLevel($level = null) {

 

-        switch ( strtoupper($level) ) {

+        switch (strtoupper($level)) {

 

             case 'INFO':

                 $logger_level = Logger::INFO;

@@ -211,7 +211,7 @@ 
     

     protected static function getFilePermission($filepermission = null) {

         

-        if ( is_null($filepermission) ) return null;

+        if (is_null($filepermission)) return null;

         

         return filter_var($bubble, FILTER_VALIDATE_INT, array(

             'options' => array(

Braces +9 added lines, -3 removed lines

@@ -65,7 +65,9 @@ 
 

                 $handler = $this->getHandler($provider, $parameters);

 

-                if ( $handler instanceof HandlerInterface ) $logger->pushHandler($handler);

+                if ( $handler instanceof HandlerInterface ) {
+                    $logger->pushHandler($handler);
+                }
 

             }

 

@@ -112,7 +114,9 @@ 
                 

             case 'SyslogHandler':

                 

-                if ( empty($parameters['ident']) ) return null;

+                if ( empty($parameters['ident']) ) {
+                    return null;
+                }
                 

                 $facility = empty($parameters['facility']) ? LOG_USER : $parameters['facility'];

             

@@ -211,7 +215,9 @@ 
     

     protected static function getFilePermission($filepermission = null) {

         

-        if ( is_null($filepermission) ) return null;

+        if ( is_null($filepermission) ) {
+            return null;
+        }
         

         return filter_var($bubble, FILTER_VALIDATE_INT, array(

             'options' => array(

src/Comodojo/Dispatcher/Components/DefaultConfiguration.php

Spacing +2 added lines, -2 removed lines

@@ -48,11 +48,11 @@
 
     private static function urlGetAbsolute() {
 
-        $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '') . '://';
+        $http = 'http'.((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '').'://';
 
         $uri = self::uriGetAbsolute();
 
-        return ( $http . $_SERVER['HTTP_HOST'] . $uri . "/" );
+        return ($http.$_SERVER['HTTP_HOST'].$uri."/");
 
     }