code improved

Анатолий Нехай · Анатолий Нехай · commit 143d1b1263c8 · 2022-04-16T00:42:31.000+05:00
diff --git a/src/HeaderAccessControlAllowHeaders.php b/src/HeaderAccessControlAllowHeaders.php
@@ -78,7 +78,7 @@ public function setValue(string ...$value) : self
     /**
      * Gets the header value
      *
-     * @return array<int, string>
+     * @return list<string>
      */
     public function getValue() : array
     {
diff --git a/src/HeaderAccessControlAllowMethods.php b/src/HeaderAccessControlAllowMethods.php
@@ -81,7 +81,7 @@ public function setValue(string ...$value) : self
     /**
      * Gets the header value
      *
-     * @return array<int, string>
+     * @return list<string>
      */
     public function getValue() : array
     {
diff --git a/src/HeaderAccessControlAllowOrigin.php b/src/HeaderAccessControlAllowOrigin.php
@@ -99,9 +99,12 @@ public function getFieldValue() : string
             return '*';
         }
 
-        $value = $uri->getScheme() . '://' . $uri->getHost();
-        if (null !== $uri->getPort()) {
-            $value .= ':' . $uri->getPort();
+        $value = $uri->getScheme() . ':';
+        $value .= '//' . $uri->getHost();
+
+        $port = $uri->getPort();
+        if (null !== $port) {
+            $value .= ':' . $port;
         }
 
         return $value;
diff --git a/src/HeaderAccessControlExposeHeaders.php b/src/HeaderAccessControlExposeHeaders.php
@@ -78,7 +78,7 @@ public function setValue(string ...$value) : self
     /**
      * Gets the header value
      *
-     * @return array<string>
+     * @return list<string>
      */
     public function getValue() : array
     {
diff --git a/src/HeaderAllow.php b/src/HeaderAllow.php
@@ -81,7 +81,7 @@ public function setValue(string ...$value) : self
     /**
      * Gets the header value
      *
-     * @return array<int, string>
+     * @return list<string>
      */
     public function getValue() : array
     {
diff --git a/src/HeaderClearSiteData.php b/src/HeaderClearSiteData.php
@@ -78,7 +78,7 @@ public function setValue(string ...$value) : self
     /**
      * Gets the header value
      *
-     * @return array<int, string>
+     * @return list<string>
      */
     public function getValue() : array
     {
diff --git a/src/HeaderContentLanguage.php b/src/HeaderContentLanguage.php
@@ -87,7 +87,7 @@ public function setValue(string ...$value) : self
     /**
      * Gets the header value
      *
-     * @return array<int, string>
+     * @return list<string>
      */
     public function getValue() : array
     {
diff --git a/src/HeaderDate.php b/src/HeaderDate.php
@@ -15,6 +15,7 @@
  * Import classes
  */
 use DateTime;
+use DateTimeImmutable;
 use DateTimeInterface;
 use DateTimeZone;
 
@@ -81,8 +82,14 @@ public function getFieldName() : string
      */
     public function getFieldValue() : string
     {
-        $this->getTimestamp()->setTimezone(new DateTimeZone('GMT'));
+        $timestamp = $this->getTimestamp();
 
-        return $this->getTimestamp()->format(DateTime::RFC822);
+        /** @psalm-suppress RedundantCondition */
+        if ($timestamp instanceof DateTime ||
+            $timestamp instanceof DateTimeImmutable) {
+            $timestamp->setTimezone(new DateTimeZone('GMT'));
+        }
+
+        return $timestamp->format(DateTime::RFC822);
     }
 }
diff --git a/src/HeaderExpires.php b/src/HeaderExpires.php
@@ -15,6 +15,7 @@
  * Import classes
  */
 use DateTime;
+use DateTimeImmutable;
 use DateTimeInterface;
 use DateTimeZone;
 
@@ -81,8 +82,14 @@ public function getFieldName() : string
      */
     public function getFieldValue() : string
     {
-        $this->getTimestamp()->setTimezone(new DateTimeZone('GMT'));
+        $timestamp = $this->getTimestamp();
 
-        return $this->getTimestamp()->format(DateTime::RFC822);
+        /** @psalm-suppress RedundantCondition */
+        if ($timestamp instanceof DateTime ||
+            $timestamp instanceof DateTimeImmutable) {
+            $timestamp->setTimezone(new DateTimeZone('GMT'));
+        }
+
+        return $timestamp->format(DateTime::RFC822);
     }
 }
diff --git a/src/HeaderLastModified.php b/src/HeaderLastModified.php
@@ -15,6 +15,7 @@
  * Import classes
  */
 use DateTime;
+use DateTimeImmutable;
 use DateTimeInterface;
 use DateTimeZone;
 
@@ -81,8 +82,14 @@ public function getFieldName() : string
      */
     public function getFieldValue() : string
     {
-        $this->getTimestamp()->setTimezone(new DateTimeZone('GMT'));
+        $timestamp = $this->getTimestamp();
 
-        return $this->getTimestamp()->format(DateTime::RFC822);
+        /** @psalm-suppress RedundantCondition */
+        if ($timestamp instanceof DateTime ||
+            $timestamp instanceof DateTimeImmutable) {
+            $timestamp->setTimezone(new DateTimeZone('GMT'));
+        }
+
+        return $timestamp->format(DateTime::RFC822);
     }
 }
diff --git a/src/HeaderRetryAfter.php b/src/HeaderRetryAfter.php
@@ -15,6 +15,7 @@
  * Import classes
  */
 use DateTime;
+use DateTimeImmutable;
 use DateTimeInterface;
 use DateTimeZone;
 
@@ -81,8 +82,14 @@ public function getFieldName() : string
      */
     public function getFieldValue() : string
     {
-        $this->getTimestamp()->setTimezone(new DateTimeZone('GMT'));
+        $timestamp = $this->getTimestamp();
 
-        return $this->getTimestamp()->format(DateTime::RFC822);
+        /** @psalm-suppress RedundantCondition */
+        if ($timestamp instanceof DateTime ||
+            $timestamp instanceof DateTimeImmutable) {
+            $timestamp->setTimezone(new DateTimeZone('GMT'));
+        }
+
+        return $timestamp->format(DateTime::RFC822);
     }
 }
diff --git a/src/HeaderSetCookie.php b/src/HeaderSetCookie.php
@@ -15,6 +15,7 @@
  * Import classes
  */
 use DateTime;
+use DateTimeImmutable;
 use DateTimeInterface;
 use DateTimeZone;
 use InvalidArgumentException;
@@ -373,31 +374,42 @@ public function getFieldValue() : string
         $value = rawurlencode($this->getValue());
         $result = sprintf('%s=%s', $name, $value);
 
-        if ($this->getExpires() instanceof DateTimeInterface) {
-            $this->getExpires()->setTimezone(new DateTimeZone('GMT'));
+        $expires = $this->getExpires();
+        if ($expires instanceof DateTimeInterface) {
 
-            $result .= '; Expires=' . $this->getExpires()->format(DateTime::RFC822);
-            $result .= '; Max-Age=' . ($this->getExpires()->getTimestamp() - time());
+            /** @psalm-suppress RedundantCondition */
+            if ($expires instanceof DateTime ||
+                $expires instanceof DateTimeImmutable) {
+                $expires->setTimezone(new DateTimeZone('GMT'));
+            }
+
+            $result .= '; Expires=' . $expires->format(DateTime::RFC822);
+            $result .= '; Max-Age=' . ($expires->getTimestamp() - time());
         }
 
-        if ($this->getDomain()) {
-            $result .= '; Domain=' . $this->getDomain();
+        $domain = $this->getDomain();
+        if (isset($domain)) {
+            $result .= '; Domain=' . $domain;
         }
 
-        if ($this->getPath()) {
-            $result .= '; Path=' . $this->getPath();
+        $path = $this->getPath();
+        if (isset($path)) {
+            $result .= '; Path=' . $path;
         }
 
-        if ($this->getSecure()) {
+        $secure = $this->getSecure();
+        if (true === $secure) {
             $result .= '; Secure';
         }
 
-        if ($this->getHttpOnly()) {
+        $httpOnly = $this->getHttpOnly();
+        if (true === $httpOnly) {
             $result .= '; HttpOnly';
         }
 
-        if ($this->getSameSite()) {
-            $result .= '; SameSite=' . $this->getSameSite();
+        $sameSite = $this->getSameSite();
+        if (isset($sameSite)) {
+            $result .= '; SameSite=' . $sameSite;
         }
 
         return $result;
diff --git a/src/HeaderSunset.php b/src/HeaderSunset.php
@@ -15,6 +15,7 @@
  * Import classes
  */
 use DateTime;
+use DateTimeImmutable;
 use DateTimeInterface;
 use DateTimeZone;
 
@@ -81,8 +82,14 @@ public function getFieldName() : string
      */
     public function getFieldValue() : string
     {
-        $this->getTimestamp()->setTimezone(new DateTimeZone('GMT'));
+        $timestamp = $this->getTimestamp();
 
-        return $this->getTimestamp()->format(DateTime::RFC822);
+        /** @psalm-suppress RedundantCondition */
+        if ($timestamp instanceof DateTime ||
+            $timestamp instanceof DateTimeImmutable) {
+            $timestamp->setTimezone(new DateTimeZone('GMT'));
+        }
+
+        return $timestamp->format(DateTime::RFC822);
     }
 }
diff --git a/src/HeaderTransferEncoding.php b/src/HeaderTransferEncoding.php
@@ -78,7 +78,7 @@ public function setValue(string ...$value) : self
     /**
      * Gets the header value
      *
-     * @return array<int, string>
+     * @return list<string>
      */
     public function getValue() : array
     {
diff --git a/src/HeaderVary.php b/src/HeaderVary.php
@@ -78,7 +78,7 @@ public function setValue(string ...$value) : self
     /**
      * Gets the header value
      *
-     * @return array<int, string>
+     * @return list<string>
      */
     public function getValue() : array
     {
diff --git a/src/HeaderWarning.php b/src/HeaderWarning.php
@@ -15,6 +15,7 @@
  * Import classes
  */
 use DateTime;
+use DateTimeImmutable;
 use DateTimeInterface;
 use DateTimeZone;
 use InvalidArgumentException;
@@ -224,10 +225,16 @@ public function getFieldValue() : string
             $this->getText()
         );
 
-        if ($this->getDate() instanceof DateTimeInterface) {
-            $this->getDate()->setTimezone(new DateTimeZone('GMT'));
+        $date = $this->getDate();
+        if (isset($date)) {
 
-            $result .= ' "' . $this->getDate()->format(DateTime::RFC822) . '"';
+            /** @psalm-suppress RedundantCondition */
+            if ($date instanceof DateTime ||
+                $date instanceof DateTimeImmutable) {
+                $date->setTimezone(new DateTimeZone('GMT'));
+            }
+
+            $result .= ' "' . $date->format(DateTime::RFC822) . '"';
         }
 
         return $result;

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function setValue(string ...$value) : self`
`78`	`78`	`/**`
`79`	`79`	`* Gets the header value`
`80`	`80`	`*`
`81`		`- * @return array<int, string>`
	`81`	`+ * @return list<string>`
`82`	`82`	`*/`
`83`	`83`	`public function getValue() : array`
`84`	`84`	`{`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function setValue(string ...$value) : self`
`81`	`81`	`/**`
`82`	`82`	`* Gets the header value`
`83`	`83`	`*`
`84`		`- * @return array<int, string>`
	`84`	`+ * @return list<string>`
`85`	`85`	`*/`
`86`	`86`	`public function getValue() : array`
`87`	`87`	`{`
Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,12 @@ public function getFieldValue() : string`
`99`	`99`	`return '*';`
`100`	`100`	`}`
`101`	`101`
`102`		`- $value = $uri->getScheme() . '://' . $uri->getHost();`
`103`		`- if (null !== $uri->getPort()) {`
`104`		`- $value .= ':' . $uri->getPort();`
	`102`	`+ $value = $uri->getScheme() . ':';`
	`103`	`+ $value .= '//' . $uri->getHost();`
	`104`	`+`
	`105`	`+ $port = $uri->getPort();`
	`106`	`+ if (null !== $port) {`
	`107`	`+ $value .= ':' . $port;`
`105`	`108`	`}`
`106`	`109`
`107`	`110`	`return $value;`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function setValue(string ...$value) : self`
`87`	`87`	`/**`
`88`	`88`	`* Gets the header value`
`89`	`89`	`*`
`90`		`- * @return array<int, string>`
	`90`	`+ * @return list<string>`
`91`	`91`	`*/`
`92`	`92`	`public function getValue() : array`
`93`	`93`	`{`