move withers up

ns3777k · ns3777k · commit 69fb08b81410 · 2020-01-13T01:05:01.000+03:00
diff --git a/src/Symfony/Component/HttpFoundation/Cookie.php b/src/Symfony/Component/HttpFoundation/Cookie.php
@@ -158,26 +158,6 @@ public function __toString()
         return $str;
     }
 
-    /**
-     * Gets the name of the cookie.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Gets the value of the cookie.
-     *
-     * @return string|null
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
     /**
      * Creates a cookie copy with a new value.
      *
@@ -191,16 +171,6 @@ public function withValue(?string $value): self
         return $cookie;
     }
 
-    /**
-     * Gets the domain that the cookie is available to.
-     *
-     * @return string|null
-     */
-    public function getDomain()
-    {
-        return $this->domain;
-    }
-
     /**
      * Creates a cookie copy with a new domain that the cookie is available to.
      *
@@ -214,16 +184,6 @@ public function withDomain(?string $domain): self
         return $cookie;
     }
 
-    /**
-     * Gets the time the cookie expires.
-     *
-     * @return int
-     */
-    public function getExpiresTime()
-    {
-        return $this->expire;
-    }
-
     /**
      * Creates a cookie copy with a new time the cookie expires.
      *
@@ -251,154 +211,194 @@ public function withExpires($expire = 0): self
     }
 
     /**
-     * Gets the max-age attribute.
+     * Creates a cookie copy with a new path on the server in which the cookie will be available on.
      *
-     * @return int
+     * @return static
      */
-    public function getMaxAge()
+    public function withPath(string $path): self
     {
-        $maxAge = $this->expire - time();
+        $cookie = clone $this;
+        $cookie->path = '' === $path ? '/' : $path;
 
-        return 0 >= $maxAge ? 0 : $maxAge;
+        return $cookie;
     }
 
     /**
-     * Gets the path on the server in which the cookie will be available on.
+     * Creates a cookie copy that only be transmitted over a secure HTTPS connection from the client.
      *
-     * @return string
+     * @return static
      */
-    public function getPath()
+    public function withSecure(bool $secure = true): self
     {
-        return $this->path;
+        $cookie = clone $this;
+        $cookie->secure = $secure;
+
+        return $cookie;
     }
 
     /**
-     * Creates a cookie copy with a new path on the server in which the cookie will be available on.
+     * Creates a cookie copy that be accessible only through the HTTP protocol.
      *
      * @return static
      */
-    public function withPath(string $path): self
+    public function withHttpOnly(bool $httpOnly = true): self
     {
         $cookie = clone $this;
-        $cookie->path = '' === $path ? '/' : $path;
+        $cookie->httpOnly = $httpOnly;
 
         return $cookie;
     }
 
     /**
-     * Checks whether the cookie should only be transmitted over a secure HTTPS connection from the client.
+     * Creates a cookie copy that uses no url encoding.
      *
-     * @return bool
+     * @return static
      */
-    public function isSecure()
+    public function withRaw(bool $raw = true): self
     {
-        return $this->secure ?? $this->secureDefault;
+        if ($raw && false !== strpbrk($this->name, self::$reservedCharsList)) {
+            throw new \InvalidArgumentException(sprintf('The cookie name "%s" contains invalid characters.', $this->name));
+        }
+
+        $cookie = clone $this;
+        $cookie->raw = $raw;
+
+        return $cookie;
     }
 
     /**
-     * Creates a cookie copy that only be transmitted over a secure HTTPS connection from the client.
+     * Creates a cookie copy with SameSite attribute.
      *
      * @return static
      */
-    public function withSecure(bool $secure = true): self
+    public function withSameSite(?string $sameSite): self
     {
+        if ('' === $sameSite) {
+            $sameSite = null;
+        } elseif (null !== $sameSite) {
+            $sameSite = strtolower($sameSite);
+        }
+
+        if (!\in_array($sameSite, [self::SAMESITE_LAX, self::SAMESITE_STRICT, self::SAMESITE_NONE, null], true)) {
+            throw new \InvalidArgumentException('The "sameSite" parameter value is not valid.');
+        }
+
         $cookie = clone $this;
-        $cookie->secure = $secure;
+        $cookie->sameSite = $sameSite;
 
         return $cookie;
     }
 
     /**
-     * Checks whether the cookie will be made accessible only through the HTTP protocol.
+     * Gets the name of the cookie.
      *
-     * @return bool
+     * @return string
      */
-    public function isHttpOnly()
+    public function getName()
     {
-        return $this->httpOnly;
+        return $this->name;
     }
 
     /**
-     * Creates a cookie copy that be accessible only through the HTTP protocol.
+     * Gets the value of the cookie.
      *
-     * @return static
+     * @return string|null
      */
-    public function withHttpOnly(bool $httpOnly = true): self
+    public function getValue()
     {
-        $cookie = clone $this;
-        $cookie->httpOnly = $httpOnly;
-
-        return $cookie;
+        return $this->value;
     }
 
     /**
-     * Whether this cookie is about to be cleared.
+     * Gets the domain that the cookie is available to.
      *
-     * @return bool
+     * @return string|null
      */
-    public function isCleared()
+    public function getDomain()
     {
-        return 0 !== $this->expire && $this->expire < time();
+        return $this->domain;
     }
 
     /**
-     * Checks if the cookie value should be sent with no url encoding.
+     * Gets the time the cookie expires.
      *
-     * @return bool
+     * @return int
      */
-    public function isRaw()
+    public function getExpiresTime()
     {
-        return $this->raw;
+        return $this->expire;
     }
 
     /**
-     * Creates a cookie copy that uses no url encoding.
+     * Gets the max-age attribute.
      *
-     * @return static
+     * @return int
      */
-    public function withRaw(bool $raw = true): self
+    public function getMaxAge()
     {
-        if ($raw && false !== strpbrk($this->name, self::$reservedCharsList)) {
-            throw new \InvalidArgumentException(sprintf('The cookie name "%s" contains invalid characters.', $this->name));
-        }
+        $maxAge = $this->expire - time();
 
-        $cookie = clone $this;
-        $cookie->raw = $raw;
+        return 0 >= $maxAge ? 0 : $maxAge;
+    }
 
-        return $cookie;
+    /**
+     * Gets the path on the server in which the cookie will be available on.
+     *
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->path;
     }
 
     /**
-     * Gets the SameSite attribute.
+     * Checks whether the cookie should only be transmitted over a secure HTTPS connection from the client.
      *
-     * @return string|null
+     * @return bool
      */
-    public function getSameSite()
+    public function isSecure()
     {
-        return $this->sameSite;
+        return $this->secure ?? $this->secureDefault;
     }
 
     /**
-     * Creates a cookie copy with SameSite attribute.
+     * Checks whether the cookie will be made accessible only through the HTTP protocol.
      *
-     * @return static
+     * @return bool
      */
-    public function withSameSite(?string $sameSite): self
+    public function isHttpOnly()
     {
-        if ('' === $sameSite) {
-            $sameSite = null;
-        } elseif (null !== $sameSite) {
-            $sameSite = strtolower($sameSite);
-        }
+        return $this->httpOnly;
+    }
 
-        if (!\in_array($sameSite, [self::SAMESITE_LAX, self::SAMESITE_STRICT, self::SAMESITE_NONE, null], true)) {
-            throw new \InvalidArgumentException('The "sameSite" parameter value is not valid.');
-        }
+    /**
+     * Whether this cookie is about to be cleared.
+     *
+     * @return bool
+     */
+    public function isCleared()
+    {
+        return 0 !== $this->expire && $this->expire < time();
+    }
 
-        $cookie = clone $this;
-        $cookie->sameSite = $sameSite;
+    /**
+     * Checks if the cookie value should be sent with no url encoding.
+     *
+     * @return bool
+     */
+    public function isRaw()
+    {
+        return $this->raw;
+    }
 
-        return $cookie;
+    /**
+     * Gets the SameSite attribute.
+     *
+     * @return string|null
+     */
+    public function getSameSite()
+    {
+        return $this->sameSite;
     }
 
     /**
