@@ -276,14 +276,14 @@ discard block |
||
| 276 | 276 | } |
| 277 | 277 | |
| 278 | 278 | /** |
| 279 | - * Setting the route configuration using the configuration file |
|
| 280 | - * and additional configuration from param |
|
| 281 | - * @param array $overwriteConfig the additional configuration |
|
| 282 | - * to overwrite with the existing one |
|
| 283 | - * @param boolean $useConfigFile whether to use route configuration file |
|
| 284 | - * |
|
| 285 | - * @return object |
|
| 286 | - */ |
|
| 279 | + * Setting the route configuration using the configuration file |
|
| 280 | + * and additional configuration from param |
|
| 281 | + * @param array $overwriteConfig the additional configuration |
|
| 282 | + * to overwrite with the existing one |
|
| 283 | + * @param boolean $useConfigFile whether to use route configuration file |
|
| 284 | + * |
|
| 285 | + * @return object |
|
| 286 | + */ |
|
| 287 | 287 | public function setRouteConfiguration(array $overwriteConfig = array(), $useConfigFile = true) { |
| 288 | 288 | $route = array(); |
| 289 | 289 | if ($useConfigFile && file_exists(CONFIG_PATH . 'routes.php')) { |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | //the URL like http://domain.com/module/controller/method/arg1/arg2/argn |
| 365 | 365 | if (!$this->controller) { |
| 366 | 366 | $this->logger->info('Cannot determine the routing information ' |
| 367 | - . 'using the predefined routes configuration, will use the request URI parameters'); |
|
| 367 | + . 'using the predefined routes configuration, will use the request URI parameters'); |
|
| 368 | 368 | //determine route parameters using the route URI param |
| 369 | 369 | $this->determineRouteParamsFromRequestUri(); |
| 370 | 370 | } |
@@ -478,11 +478,11 @@ discard block |
||
| 478 | 478 | } |
| 479 | 479 | } |
| 480 | 480 | |
| 481 | - /** |
|
| 482 | - * Remove the URL suffix and query string values if exists |
|
| 483 | - * @param string $uri the route URI to process |
|
| 484 | - * @return string the final route uri after processed |
|
| 485 | - */ |
|
| 481 | + /** |
|
| 482 | + * Remove the URL suffix and query string values if exists |
|
| 483 | + * @param string $uri the route URI to process |
|
| 484 | + * @return string the final route uri after processed |
|
| 485 | + */ |
|
| 486 | 486 | protected function removeSuffixAndQueryStringFromUri($uri) { |
| 487 | 487 | $this->logger->debug('Check if URL suffix is enabled in the configuration'); |
| 488 | 488 | //remove url suffix from the request URI |
@@ -598,7 +598,7 @@ discard block |
||
| 598 | 598 | $this->logger->info( |
| 599 | 599 | 'After loop in predefined routes configuration,' |
| 600 | 600 | . 'the module name is set but the controller is not set,' |
| 601 | - . 'so we will use module as the controller' |
|
| 601 | + . 'so we will use module as the controller' |
|
| 602 | 602 | ); |
| 603 | 603 | $this->controller = $this->module; |
| 604 | 604 | } |