Merge pull request #4 from timw4mail/scrutinizer-patch-1
Scrutinizer Auto-Fixes
This commit is contained in:
commit
c86d72f3e2
@ -22,7 +22,7 @@ class Config {
|
|||||||
*
|
*
|
||||||
* @param array $config_files
|
* @param array $config_files
|
||||||
*/
|
*/
|
||||||
public function __construct(array $config_files=[])
|
public function __construct(array $config_files = [])
|
||||||
{
|
{
|
||||||
// @codeCoverageIgnoreStart
|
// @codeCoverageIgnoreStart
|
||||||
if (empty($config_files))
|
if (empty($config_files))
|
||||||
|
@ -144,7 +144,7 @@ class Router extends RoutingBase {
|
|||||||
|
|
||||||
if ( ! empty($route->tokens))
|
if ( ! empty($route->tokens))
|
||||||
{
|
{
|
||||||
foreach($route->tokens as $key => $v)
|
foreach ($route->tokens as $key => $v)
|
||||||
{
|
{
|
||||||
if (array_key_exists($key, $route->params))
|
if (array_key_exists($key, $route->params))
|
||||||
{
|
{
|
||||||
@ -201,7 +201,7 @@ class Router extends RoutingBase {
|
|||||||
|
|
||||||
$controllers = [];
|
$controllers = [];
|
||||||
|
|
||||||
foreach($class_files as $file)
|
foreach ($class_files as $file)
|
||||||
{
|
{
|
||||||
$raw_class_name = basename(str_replace(".php", "", $file));
|
$raw_class_name = basename(str_replace(".php", "", $file));
|
||||||
$path = strtolower(basename($raw_class_name));
|
$path = strtolower(basename($raw_class_name));
|
||||||
@ -230,7 +230,7 @@ class Router extends RoutingBase {
|
|||||||
$applied_routes = array_merge($this->routes[$route_type], $this->routes['common']);
|
$applied_routes = array_merge($this->routes[$route_type], $this->routes['common']);
|
||||||
|
|
||||||
// Add routes
|
// Add routes
|
||||||
foreach($applied_routes as $name => &$route)
|
foreach ($applied_routes as $name => &$route)
|
||||||
{
|
{
|
||||||
$path = $route['path'];
|
$path = $route['path'];
|
||||||
unset($route['path']);
|
unset($route['path']);
|
||||||
|
Loading…
Reference in New Issue
Block a user