diff --git a/app/Foundation/Providers/RouteServiceProvider.php b/app/Foundation/Providers/RouteServiceProvider.php index df1a1f54..99179da5 100644 --- a/app/Foundation/Providers/RouteServiceProvider.php +++ b/app/Foundation/Providers/RouteServiceProvider.php @@ -57,7 +57,7 @@ class RouteServiceProvider extends ServiceProvider AuthRoutes::class, SetupRoutes::class, ApiSystemRoutes::class, - ApiSetupRoutes::class + ApiSetupRoutes::class, ]; /** @@ -148,7 +148,6 @@ class RouteServiceProvider extends ServiceProvider SubstituteBindings::class, ]; - if ($applyAlwaysAuthenticate && !$this->isWhiteListedAuthRoute($routes)) { $middleware[] = Authenticate::class; } @@ -187,19 +186,20 @@ class RouteServiceProvider extends ServiceProvider /** * Validates if the route object is an instance of the whitelisted routes. - * A small workaround since we cant use multiple classes in a `instanceof` comparison + * A small workaround since we cant use multiple classes in a `instanceof` comparison. * - * @param object $routes + * @param object $routes * * @return bool */ private function isWhiteListedAuthRoute($routes) { foreach ($this->whitelistedAuthRoutes as $whitelistedRoute) { - if(is_a($routes, $whitelistedRoute)) { + if (is_a($routes, $whitelistedRoute)) { return true; } } + return false; } } diff --git a/app/Http/Controllers/Dashboard/SettingsController.php b/app/Http/Controllers/Dashboard/SettingsController.php index 383db5e9..55db43a5 100644 --- a/app/Http/Controllers/Dashboard/SettingsController.php +++ b/app/Http/Controllers/Dashboard/SettingsController.php @@ -20,8 +20,8 @@ use Exception; use GrahamCampbell\Binput\Facades\Binput; use Illuminate\Log\Writer; use Illuminate\Routing\Controller; -use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Artisan; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Lang; use Illuminate\Support\Facades\Redirect;