tnhfw / tnh-fw

core/classes/Router.php

Indentation +16 added lines, -16 removed lines

@@ -278,14 +278,14 @@ 
         }
 
         /**
-        * Setting the route configuration using the configuration file 
-        * and additional configuration from param
-        * @param array $overwriteConfig the additional configuration 
-        * to overwrite with the existing one
-        * @param boolean $useConfigFile whether to use route configuration file
-        * 
-        * @return object
-        */
+         * Setting the route configuration using the configuration file 
+         * and additional configuration from param
+         * @param array $overwriteConfig the additional configuration 
+         * to overwrite with the existing one
+         * @param boolean $useConfigFile whether to use route configuration file
+         * 
+         * @return object
+         */
         public function setRouteConfiguration(array $overwriteConfig = array(), $useConfigFile = true) {
             $route = array();
             if ($useConfigFile && file_exists(CONFIG_PATH . 'routes.php')) {
@@ -366,7 +366,7 @@ 
             //the URL like http://domain.com/module/controller/method/arg1/arg2/argn 
             if (!$this->controller && $this->routeMethodMatch /* normally if the route method isnot match no need continue */) {
                 $this->logger->info('Cannot determine the routing information ' 
-                       . 'using the predefined routes configuration, will use the request URI parameters');
+                        . 'using the predefined routes configuration, will use the request URI parameters');
                 //determine route parameters using the route URI param
                 $this->determineRouteParamsFromRequestUri();
             }
@@ -395,7 +395,7 @@ 
 
             //if the request method not match
             if(!$this->routeMethodMatch){
-                 //create the instance of Controller
+                    //create the instance of Controller
                 $cError = new Controller();
                 $cError->response->setStatus(405);
                 $cError->response->setFinalPageContent('HTTP method [' . $this->requestMethod . '] not allowed');
@@ -493,11 +493,11 @@ 
             }
         }
 
-         /**
-         * Remove the URL suffix and query string values if exists
-         * @param  string $uri the route URI to process
-         * @return string      the final route uri after processed
-         */
+            /**
+             * Remove the URL suffix and query string values if exists
+             * @param  string $uri the route URI to process
+             * @return string      the final route uri after processed
+             */
         protected function removeSuffixAndQueryStringFromUri($uri) {
             $this->logger->debug('Check if URL suffix is enabled in the configuration');
             //remove url suffix from the request URI
@@ -626,7 +626,7 @@ 
                 $this->logger->info(
                                     'After loop in predefined routes configuration,'
                                     . 'the module name is set but the controller is not set,' 
-									. 'so we will use module as the controller'
+                                    . 'so we will use module as the controller'
                                 );
                 $this->controller = $this->module;
             }

Spacing +10 added lines, -10 removed lines

@@ -394,7 +394,7 @@ 
             $this->determineRouteParamsInformation();
 
             //if the request method not match
-            if(!$this->routeMethodMatch){
+            if (!$this->routeMethodMatch) {
                  //create the instance of Controller
                 $cError = new Controller();
                 $cError->response->setStatus(405);
@@ -465,7 +465,7 @@ 
          * Remove the DOCUMENT_ROOT and front controller from segments if exists
          * @return void
          */
-        protected function removeDocumentRootFrontControllerFromSegments(){
+        protected function removeDocumentRootFrontControllerFromSegments() {
             $segment = $this->segments;
             $globals = & class_loader('GlobalVar', 'classes');
             $rootFolder = substr($globals->server('SCRIPT_NAME'), 0, strpos(
@@ -519,11 +519,11 @@ 
         protected function setRouteParamsUsingPredefinedConfig($findIndex) {
             $callback = $this->callback[$findIndex];
             //if callback is array so means user defined the HTTP Method
-            if(is_array($callback) && count($callback) > 0){
-                if(array_key_exists($this->requestMethod, $callback)){
+            if (is_array($callback) && count($callback) > 0) {
+                if (array_key_exists($this->requestMethod, $callback)) {
                     $callback = $callback[$this->requestMethod];
                 }
-                else{
+                else {
                     //Wrong request method
                     $this->logger->warning('The request method [' . $this->requestMethod . '] is not allowed');
                     $this->routeMethodMatch = false;
@@ -609,7 +609,7 @@ 
                     break;
                 }
             }
-            if($findIndex !== -1){
+            if ($findIndex !== -1) {
                 /*
                 * $args[0] => full string captured by preg_match
                 * $args[1], $args[2], $args[n] => contains the value of 
@@ -636,7 +636,7 @@ 
          * Find file path of the current controller using the current module
          * @return boolean true if the file path is found otherwise false.
          */
-        protected function findControllerFullPathUsingCurrentModule(){
+        protected function findControllerFullPathUsingCurrentModule() {
             $path = $this->moduleInstance->findControllerFullPath(ucfirst($this->controller), $this->module);
             if (!$path) {
                 $this->logger->info('The controller [' . $this->controller . '] not ' 
@@ -653,7 +653,7 @@ 
          * or the current request does not use module
          * @return void
          */
-        protected function setRouteParamsIfNoModuleOrNotFound(){
+        protected function setRouteParamsIfNoModuleOrNotFound() {
             $segment = $this->segments;
             //controller
             if (isset($segment[0])) {
@@ -674,7 +674,7 @@ 
          * or the current request use module
          * @return void
          */
-        protected function setRouteParamsIfAppHasModuleOrFound(){
+        protected function setRouteParamsIfAppHasModuleOrFound() {
             //get the module list
             $modules = $this->moduleInstance->getModuleList();
             $segment = $this->segments;
@@ -686,7 +686,7 @@ 
                 if (isset($segment[0])) {
                     $this->controller = $segment[0];
                     //check if the request use the same module name and controller
-                    if($this->findControllerFullPathUsingCurrentModule()){
+                    if ($this->findControllerFullPathUsingCurrentModule()) {
                         array_shift($segment);
                     }
                 }

Braces +1 added lines, -2 removed lines

@@ -522,8 +522,7 @@
             if(is_array($callback) && count($callback) > 0){
                 if(array_key_exists($this->requestMethod, $callback)){
                     $callback = $callback[$this->requestMethod];
-                }
-                else{
+                } else{
                     //Wrong request method
                     $this->logger->warning('The request method [' . $this->requestMethod . '] is not allowed');
                     $this->routeMethodMatch = false;