change formatting of config var

laravel · Mar 1, 2017 · e69d722 · e69d722
1 parent c2d6cdb
commit e69d722
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/Illuminate/Cookie/CookieServiceProvider.php b/src/Illuminate/Cookie/CookieServiceProvider.php
@@ -16,7 +16,9 @@ public function register()
         $this->app->singleton('cookie', function ($app) {
             $config = $app->make('config')->get('session');
 
-            return (new CookieJar)->setDefaultPathAndDomain($config['path'], $config['domain'], $config['secure'], $config['sameSite']);
+            return (new CookieJar)->setDefaultPathAndDomain(
+                $config['path'], $config['domain'], $config['secure'], $config['same_site'] ?? null
+            );
         });
     }
 }
diff --git a/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php b/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php
@@ -156,7 +156,7 @@ protected function addCookieToResponse($request, $response)
         $response->headers->setCookie(
             new Cookie(
                 'XSRF-TOKEN', $request->session()->token(), Carbon::now()->getTimestamp() + 60 * $config['lifetime'],
-                $config['path'], $config['domain'], $config['secure'], false, false, $config['sameSite']
+                $config['path'], $config['domain'], $config['secure'], false, false, $config['same_site'] ?? null
             )
         );
 

diff --git a/src/Illuminate/Session/Middleware/StartSession.php b/src/Illuminate/Session/Middleware/StartSession.php
@@ -177,7 +177,7 @@ protected function addCookieToResponse(Response $response, Session $session)
             $response->headers->setCookie(new Cookie(
                 $session->getName(), $session->getId(), $this->getCookieExpirationDate(),
                 $config['path'], $config['domain'], Arr::get($config, 'secure', false),
-                Arr::get($config, 'http_only', true), false, $config['sameSite']
+                Arr::get($config, 'http_only', true), false, $config['same_site'] ?? null
             ));
         }
     }