Fix StyleCI and tests

laravel · Feb 22, 2017 · 707dcf1 · 707dcf1
1 parent 8805e43
commit 707dcf1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Illuminate/Cookie/CookieJar.php b/src/Illuminate/Cookie/CookieJar.php
@@ -158,7 +158,7 @@ public function unqueue($name)
      * @param  string  $sameSite
      * @return array
      */
-    protected function getPathAndDomain($path, $domain, $secure = false, $sameSite)
+    protected function getPathAndDomain($path, $domain, $secure = false, $sameSite = null)
     {
         return [$path ?: $this->path, $domain ?: $this->domain, $secure ?: $this->secure, $sameSite ?: $this->sameSite];
     }
@@ -172,7 +172,7 @@ protected function getPathAndDomain($path, $domain, $secure = false, $sameSite)
      * @param  string  $sameSite
      * @return $this
      */
-    public function setDefaultPathAndDomain($path, $domain, $secure = false, $sameSite)
+    public function setDefaultPathAndDomain($path, $domain, $secure = false, $sameSite = null)
     {
         list($this->path, $this->domain, $this->secure, $this->sameSite) = [$path, $domain, $secure, $sameSite];
 

diff --git a/tests/Cookie/CookieTest.php b/tests/Cookie/CookieTest.php
@@ -44,7 +44,7 @@ public function testCookiesAreCreatedWithProperOptionsUsingDefaultPathAndDomain(
         $cookie = $this->getCreator();
         $cookie->setDefaultPathAndDomain('/path', '/domain', true, 'lax');
         $c = $cookie->make('color', 'blue');
-        $this->assertEquals('blue', $c->getValue());        
+        $this->assertEquals('blue', $c->getValue());
         $this->assertTrue($c->isSecure());
         $this->assertEquals('/domain', $c->getDomain());
         $this->assertEquals('/path', $c->getPath());