updated-packages

vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php

@@ -3,13 +3,14 @@
 namespace Illuminate\Cookie;
 
 use Illuminate\Support\Arr;
+use Illuminate\Support\Traits\Macroable;
 use Illuminate\Support\InteractsWithTime;
 use Symfony\Component\HttpFoundation\Cookie;
 use Illuminate\Contracts\Cookie\QueueingFactory as JarContract;
 
 class CookieJar implements JarContract
 {
-    use InteractsWithTime;
+    use InteractsWithTime, Macroable;
 
     /**
      * The default path (if specified).
@@ -52,8 +53,8 @@ class CookieJar implements JarContract
      * @param  string       $name
      * @param  string       $value
      * @param  int          $minutes
-     * @param  string       $path
-     * @param  string       $domain
+     * @param  string|null  $path
+     * @param  string|null  $domain
      * @param  bool|null    $secure
      * @param  bool         $httpOnly
      * @param  bool         $raw
@@ -62,7 +63,7 @@ class CookieJar implements JarContract
      */
     public function make($name, $value, $minutes = 0, $path = null, $domain = null, $secure = null, $httpOnly = true, $raw = false, $sameSite = null)
     {
-        list($path, $domain, $secure, $sameSite) = $this->getPathAndDomain($path, $domain, $secure, $sameSite);
+        [$path, $domain, $secure, $sameSite] = $this->getPathAndDomain($path, $domain, $secure, $sameSite);
 
         $time = ($minutes == 0) ? 0 : $this->availableAt($minutes * 60);
 
@@ -74,8 +75,8 @@ class CookieJar implements JarContract
      *
      * @param  string       $name
      * @param  string       $value
-     * @param  string       $path
-     * @param  string       $domain
+     * @param  string|null  $path
+     * @param  string|null  $domain
      * @param  bool|null    $secure
      * @param  bool         $httpOnly
      * @param  bool         $raw
@@ -91,8 +92,8 @@ class CookieJar implements JarContract
      * Expire the given cookie.
      *
      * @param  string  $name
-     * @param  string  $path
-     * @param  string  $domain
+     * @param  string|null  $path
+     * @param  string|null  $domain
      * @return \Symfony\Component\HttpFoundation\Cookie
      */
     public function forget($name, $path = null, $domain = null)
@@ -157,7 +158,7 @@ class CookieJar implements JarContract
      * @param  string    $path
      * @param  string    $domain
      * @param  bool|null $secure
-     * @param  string    $sameSite
+     * @param  string|null  $sameSite
      * @return array
      */
     protected function getPathAndDomain($path, $domain, $secure = null, $sameSite = null)
@@ -171,12 +172,12 @@ class CookieJar implements JarContract
      * @param  string  $path
      * @param  string  $domain
      * @param  bool    $secure
-     * @param  string  $sameSite
+     * @param  string|null  $sameSite
      * @return $this
      */
     public function setDefaultPathAndDomain($path, $domain, $secure = false, $sameSite = null)
     {
-        list($this->path, $this->domain, $this->secure, $this->sameSite) = [$path, $domain, $secure, $sameSite];
+        [$this->path, $this->domain, $this->secure, $this->sameSite] = [$path, $domain, $secure, $sameSite];
 
         return $this;
     }