@@ -278,14 +278,14 @@ discard block |
||
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | /** |
| 281 | - * Setting the route configuration using the configuration file |
|
| 282 | - * and additional configuration from param |
|
| 283 | - * @param array $overwriteConfig the additional configuration |
|
| 284 | - * to overwrite with the existing one |
|
| 285 | - * @param boolean $useConfigFile whether to use route configuration file |
|
| 286 | - * |
|
| 287 | - * @return object |
|
| 288 | - */ |
|
| 281 | + * Setting the route configuration using the configuration file |
|
| 282 | + * and additional configuration from param |
|
| 283 | + * @param array $overwriteConfig the additional configuration |
|
| 284 | + * to overwrite with the existing one |
|
| 285 | + * @param boolean $useConfigFile whether to use route configuration file |
|
| 286 | + * |
|
| 287 | + * @return object |
|
| 288 | + */ |
|
| 289 | 289 | public function setRouteConfiguration(array $overwriteConfig = array(), $useConfigFile = true) { |
| 290 | 290 | $route = array(); |
| 291 | 291 | if ($useConfigFile && file_exists(CONFIG_PATH . 'routes.php')) { |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | //the URL like http://domain.com/module/controller/method/arg1/arg2/argn |
| 367 | 367 | if (!$this->controller && $this->routeMethodMatch /* normally if the route method isnot match no need continue */) { |
| 368 | 368 | $this->logger->info('Cannot determine the routing information ' |
| 369 | - . 'using the predefined routes configuration, will use the request URI parameters'); |
|
| 369 | + . 'using the predefined routes configuration, will use the request URI parameters'); |
|
| 370 | 370 | //determine route parameters using the route URI param |
| 371 | 371 | $this->determineRouteParamsFromRequestUri(); |
| 372 | 372 | } |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | |
| 396 | 396 | //if the request method not match |
| 397 | 397 | if(!$this->routeMethodMatch){ |
| 398 | - //create the instance of Controller |
|
| 398 | + //create the instance of Controller |
|
| 399 | 399 | $cError = new Controller(); |
| 400 | 400 | $cError->response->setStatus(405); |
| 401 | 401 | $cError->response->setFinalPageContent('HTTP method [' . $this->requestMethod . '] not allowed'); |
@@ -493,11 +493,11 @@ discard block |
||
| 493 | 493 | } |
| 494 | 494 | } |
| 495 | 495 | |
| 496 | - /** |
|
| 497 | - * Remove the URL suffix and query string values if exists |
|
| 498 | - * @param string $uri the route URI to process |
|
| 499 | - * @return string the final route uri after processed |
|
| 500 | - */ |
|
| 496 | + /** |
|
| 497 | + * Remove the URL suffix and query string values if exists |
|
| 498 | + * @param string $uri the route URI to process |
|
| 499 | + * @return string the final route uri after processed |
|
| 500 | + */ |
|
| 501 | 501 | protected function removeSuffixAndQueryStringFromUri($uri) { |
| 502 | 502 | $this->logger->debug('Check if URL suffix is enabled in the configuration'); |
| 503 | 503 | //remove url suffix from the request URI |
@@ -626,7 +626,7 @@ discard block |
||
| 626 | 626 | $this->logger->info( |
| 627 | 627 | 'After loop in predefined routes configuration,' |
| 628 | 628 | . 'the module name is set but the controller is not set,' |
| 629 | - . 'so we will use module as the controller' |
|
| 629 | + . 'so we will use module as the controller' |
|
| 630 | 630 | ); |
| 631 | 631 | $this->controller = $this->module; |
| 632 | 632 | } |