From ffe9c99f9c1a244394b1be3c5d92a192a63f0fa0 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 26 Jan 2019 10:38:21 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Foundation/Providers/RouteServiceProvider.php | 2 +- app/Http/Kernel.php | 2 +- app/Http/Middleware/VerifyCsrfToken.php | 4 ++-- config/cors.php | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Foundation/Providers/RouteServiceProvider.php b/app/Foundation/Providers/RouteServiceProvider.php index b375e5a5..45c01a5d 100644 --- a/app/Foundation/Providers/RouteServiceProvider.php +++ b/app/Foundation/Providers/RouteServiceProvider.php @@ -14,6 +14,7 @@ namespace CachetHQ\Cachet\Foundation\Providers; use CachetHQ\Cachet\Http\Middleware\Acceptable; use CachetHQ\Cachet\Http\Middleware\Authenticate; use CachetHQ\Cachet\Http\Middleware\Timezone; +use CachetHQ\Cachet\Http\Middleware\VerifyCsrfToken; use CachetHQ\Cachet\Http\Routes\ApiSystemRoutes; use CachetHQ\Cachet\Http\Routes\AuthRoutes; use CachetHQ\Cachet\Http\Routes\Setup\ApiRoutes as ApiSetupRoutes; @@ -26,7 +27,6 @@ use Illuminate\Routing\Middleware\SubstituteBindings; use Illuminate\Routing\Router; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; -use CachetHQ\Cachet\Http\Middleware\VerifyCsrfToken; /** * This is the route service provider. diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index fe449484..c0079a83 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -12,6 +12,7 @@ namespace CachetHQ\Cachet\Http; use AltThree\Throttle\ThrottlingMiddleware; +use Barryvdh\Cors\HandleCors; use CachetHQ\Cachet\Http\Middleware\Admin; use CachetHQ\Cachet\Http\Middleware\ApiAuthentication; use CachetHQ\Cachet\Http\Middleware\Authenticate; @@ -24,7 +25,6 @@ use CachetHQ\Cachet\Http\Middleware\TrustProxies; use Illuminate\Auth\Middleware\Authorize; use Illuminate\Foundation\Http\Kernel as HttpKernel; use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode; -use Barryvdh\Cors\HandleCors; class Kernel extends HttpKernel { diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index 213645b7..03736d46 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -28,6 +28,6 @@ class VerifyCsrfToken extends Middleware * @var array */ protected $except = [ - '/api/*' + '/api/*', ]; -} \ No newline at end of file +} diff --git a/config/cors.php b/config/cors.php index a1079ccf..6e843598 100644 --- a/config/cors.php +++ b/config/cors.php @@ -10,7 +10,7 @@ */ return [ - + /* |-------------------------------------------------------------------------- | Laravel CORS @@ -20,7 +20,7 @@ return [ | to accept any value. | */ - + 'supportsCredentials' => false, 'allowedOrigins' => ['*'], 'allowedOriginsPatterns' => [],