Merge branch 'master' into develop

D3Z1R3 · Mar 14, 2020 · 57cd6a8 · 57cd6a8
2 parents 404b43b + f93f4ad
commit 57cd6a8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 22 deletions.
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
@@ -59,8 +59,8 @@ public function map()
     protected function mapWebRoutes()
     {
         Route::middleware('web')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/web.php'));
+            ->namespace($this->namespace)
+            ->group(base_path('routes/web.php'));
     }
 
     /**
@@ -73,8 +73,8 @@ protected function mapWebRoutes()
     protected function mapApiRoutes()
     {
         Route::prefix('api')
-             ->middleware('api')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/api.php'));
+            ->middleware('api')
+            ->namespace($this->namespace)
+            ->group(base_path('routes/api.php'));
     }
 }
diff --git a/config/cors.php b/config/cors.php
@@ -25,9 +25,9 @@
 
     'allowed_headers' => ['*'],
 
-    'exposed_headers' => false,
+    'exposed_headers' => [],
 
-    'max_age' => false,
+    'max_age' => 0,
 
     'supports_credentials' => false,
 

diff --git a/config/queue.php b/config/queue.php
@@ -55,6 +55,7 @@
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
             'queue' => env('SQS_QUEUE', 'your-queue-name'),
+            'suffix' => env('SQS_SUFFIX'),
             'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
         ],
 

diff --git a/config/session.php b/config/session.php
@@ -166,7 +166,7 @@
     |
     */
 
-    'secure' => env('SESSION_SECURE_COOKIE', null),
+    'secure' => env('SESSION_SECURE_COOKIE'),
 
     /*
     |--------------------------------------------------------------------------
@@ -190,7 +190,7 @@
     | take place, and can be used to mitigate CSRF attacks. By default, we
     | do not enable this as other CSRF protection services are in place.
     |
-    | Supported: "lax", "strict", "none"
+    | Supported: "lax", "strict", "none", null
     |
     */
 

diff --git a/config/view.php b/config/view.php
@@ -33,17 +33,4 @@
         realpath(storage_path('framework/views'))
     ),
 
-    /*
-     |--------------------------------------------------------------------------
-     | Blade View Modification Checking
-     |--------------------------------------------------------------------------
-     |
-     | On every request the framework will check to see if a view has expired
-     | to determine if it needs to be recompiled. If you are in production
-     | and precompiling views this feature may be disabled to save time.
-     |
-     */
-
-    'expires' => env('VIEW_CHECK_EXPIRATION', true),
-
 ];