comodojo / dispatcher.framework

src/Router/Collector.php

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);
                     

Doc Comments +8 added lines

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

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

@@ -85,7 +85,7 @@ 
         
         $this->extra = new Extra($this->logger);
         
-        $this->router->load( $routing_table );
+        $this->router->load($routing_table);
 
     }
 
@@ -133,9 +133,9 @@ 
 
     public function dispatch() {
 
-        $this->events->emit( new DispatcherEvent($this) );
+        $this->events->emit(new DispatcherEvent($this));
         
-        if ( $this->configuration()->get('dispatcher-enabled') === false ) {
+        if ($this->configuration()->get('dispatcher-enabled') === false) {
             
             $status = $this->configuration()->get('dispatcher-disabled-status');
             
@@ -147,31 +147,31 @@ 
             
         } else {
             
-            $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.#'));
             
         }
 

src/Cache/DispatcherCache.php

Doc Comments -2 removed lines

@@ -66,8 +66,6 @@
     /**

      * Map provided log level to level code

      *

-     * @param   string    $level

-     *

      * @return  integer

      */

     protected static function getAlgorithm($algorithm) {

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
         

         $ttl = $configuration->get('dispatcher-cache-ttl');

         

-        if ( $ttl !== null && !defined('COMODOJO_CACHE_DEFAULT_TTL') ) {

+        if ($ttl !== null && !defined('COMODOJO_CACHE_DEFAULT_TTL')) {

             

             define('COMODOJO_CACHE_DEFAULT_TTL', $ttl);

             

@@ -49,13 +49,13 @@ 
         

         $folder = $configuration->get('dispatcher-cache-folder');

         

-        $algorithm = self::getAlgorithm( $configuration->get('dispatcher-cache-algorithm') );

+        $algorithm = self::getAlgorithm($configuration->get('dispatcher-cache-algorithm'));

     

-        $manager = new CacheManager( $algorithm );

+        $manager = new CacheManager($algorithm);

         

-        if ( $enabled === true ) {

+        if ($enabled === true) {

             

-            $manager->addProvider( new FileCache($folder) );

+            $manager->addProvider(new FileCache($folder));

             

         }

         

@@ -72,7 +72,7 @@ 
      */

     protected static function getAlgorithm($algorithm) {

 

-        switch ( strtoupper($algorithm) ) {

+        switch (strtoupper($algorithm)) {

 

             case 'PICK_LAST':

                 $selected = CacheManager::PICK_LAST;

src/Log/DispatcherLogger.php

Doc Comments -2 removed lines

@@ -33,8 +33,6 @@
     /**

      * Create the logger

      *

-     * @param bool $verbose

-     *

      * @return \Monolog\Logger

      */

     public static function create(Configuration $configuration) {

Spacing +5 added lines, -5 removed lines

@@ -43,19 +43,19 @@ 
         

         $enabled = $configuration->get('dispatcher-log-enabled');

         

-        $level = self::getLevel( $configuration->get('dispatcher-log-level') );

+        $level = self::getLevel($configuration->get('dispatcher-log-level'));

         

         $target = $configuration->get('dispatcher-log-target');

     

         $logger = new Logger($name);

         

-        if ( $enabled === true ) {

+        if ($enabled === true) {

             

-            $logger->pushHandler( new StreamHandler( $target, $level) );

+            $logger->pushHandler(new StreamHandler($target, $level));

             

         } else {

             

-            $logger->pushHandler( new NullHandler($level) );

+            $logger->pushHandler(new NullHandler($level));

             

         }

         

@@ -72,7 +72,7 @@ 
      */

     protected static function getLevel($level) {

 

-        switch ( strtoupper($level) ) {

+        switch (strtoupper($level)) {

 

             case 'INFO':

                 $logger_level = Logger::INFO;

src/Components/Configuration.php

Spacing +6 added lines, -6 removed lines

@@ -43,7 +43,7 @@ 
         //'dispatcher-autoroute' => false
     );
 
-    public function __construct( $configuration = array() ) {
+    public function __construct($configuration = array()) {
 
         $this->attributes['dispatcher-base-url'] = self::urlGetAbsolute();
         
@@ -59,15 +59,15 @@ 
 
             $value = $this->attributes[$property];
             
-            if ( preg_match_all('/%(.+?)%/', $value, $matches) ) {
+            if (preg_match_all('/%(.+?)%/', $value, $matches)) {
                 
                 $substitutions = array();
                 
-                foreach ( $matches as $match ) {
+                foreach ($matches as $match) {
                     
                     $backreference = $match[1];
                     
-                    if ( $backreference != $property && !isset($substitutions['/%'.$backreference.'%/']) ) {
+                    if ($backreference != $property && !isset($substitutions['/%'.$backreference.'%/'])) {
                         
                         $substitutions['/%'.$backreference.'%/'] = $this->$backreference;
                         
@@ -111,11 +111,11 @@ 
 
     private static function urlGetAbsolute() {
 
-        $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '') . '://';
+        $http = 'http'.((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '').'://';
 
         $uri = preg_replace("/\/index.php(.*?)$/i", "", $_SERVER['PHP_SELF']);
 
-        return ( $http . $_SERVER['HTTP_HOST'] . $uri . "/" );
+        return ($http.$_SERVER['HTTP_HOST'].$uri."/");
 
     }