Merge pull request #181 from laminas/renovate/lock-file-maintenance

Xerkus · web-flow · commit 74cfb9a7522f · 2024-02-17T02:06:16.000+10:00
Lock file maintenance, Upgrade Psalm to 5.20.x
diff --git a/composer.json b/composer.json
@@ -46,9 +46,9 @@
         "http-interop/http-factory-tests": "^0.9.0",
         "laminas/laminas-coding-standard": "~2.5.0",
         "php-http/psr7-integration-tests": "^1.3",
-        "phpunit/phpunit": "^9.5.28",
+        "phpunit/phpunit": "^9.6.16",
         "psalm/plugin-phpunit": "^0.18.4",
-        "vimeo/psalm": "^5.17"
+        "vimeo/psalm": "^5.22.1"
     },
     "provide": {
         "psr/http-factory-implementation": "^1.1 || ^2.0",
diff --git a/composer.lock b/composer.lock
diff --git a/src/AbstractSerializer.php b/src/AbstractSerializer.php
@@ -99,7 +99,7 @@ protected static function splitStream(StreamInterface $stream): array
                 continue;
             }
 
-            if (! $currentHeader) {
+            if ($currentHeader === false) {
                 throw Exception\DeserializationException::forInvalidHeader();
             }
 
diff --git a/src/CallbackStream.php b/src/CallbackStream.php
@@ -84,7 +84,7 @@ public function tell(): int
      */
     public function eof(): bool
     {
-        return empty($this->callback);
+        return $this->callback === null;
     }
 
     /**
@@ -149,7 +149,7 @@ public function read(int $length): string
     public function getContents(): string
     {
         $callback = $this->detach();
-        $contents = $callback ? $callback() : '';
+        $contents = $callback !== null ? $callback() : '';
         return (string) $contents;
     }
 
diff --git a/src/RequestTrait.php b/src/RequestTrait.php
@@ -252,7 +252,7 @@ public function withUri(UriInterface $uri, bool $preserveHost = false): RequestI
         }
 
         $host = $uri->getHost();
-        if ($uri->getPort()) {
+        if ($uri->getPort() !== null) {
             $host .= ':' . $uri->getPort();
         }
 
@@ -294,7 +294,7 @@ private function setMethod(string $method): void
     private function getHostFromUri(): string
     {
         $host  = $this->uri->getHost();
-        $host .= $this->uri->getPort() ? ':' . $this->uri->getPort() : '';
+        $host .= $this->uri->getPort() !== null ? ':' . $this->uri->getPort() : '';
         return $host;
     }
 }
diff --git a/src/Stream.php b/src/Stream.php
@@ -210,11 +210,11 @@ public function isWritable(): bool
         $meta = stream_get_meta_data($this->resource);
         $mode = $meta['mode'];
 
-        return strstr($mode, 'x')
-            || strstr($mode, 'w')
-            || strstr($mode, 'c')
-            || strstr($mode, 'a')
-            || strstr($mode, '+');
+        return strstr($mode, 'x') !== false
+            || strstr($mode, 'w') !== false
+            || strstr($mode, 'c') !== false
+            || strstr($mode, 'a') !== false
+            || strstr($mode, '+') !== false;
     }
 
     /**
@@ -251,7 +251,7 @@ public function isReadable(): bool
         $meta = stream_get_meta_data($this->resource);
         $mode = $meta['mode'];
 
-        return strstr($mode, 'r') || strstr($mode, '+');
+        return strstr($mode, 'r') !== false || strstr($mode, '+') !== false;
     }
 
     /**
diff --git a/src/UploadedFile.php b/src/UploadedFile.php
@@ -50,8 +50,7 @@ class UploadedFile implements UploadedFileInterface
 
     private bool $moved = false;
 
-    /** @var null|StreamInterface */
-    private $stream;
+    private ?StreamInterface $stream = null;
 
     /**
      * @param string|resource|StreamInterface $streamOrFile
@@ -72,7 +71,7 @@ public function __construct(
                 $this->stream = new Stream($streamOrFile);
             }
 
-            if (! $this->file && ! $this->stream) {
+            if ($this->file === null && $this->stream === null) {
                 if (! $streamOrFile instanceof StreamInterface) {
                     throw new Exception\InvalidArgumentException('Invalid stream or file provided for UploadedFile');
                 }
@@ -150,7 +149,10 @@ public function moveTo(string $targetPath): void
 
         $sapi = PHP_SAPI;
         switch (true) {
-            case empty($sapi) || str_starts_with($sapi, 'cli') || str_starts_with($sapi, 'phpdbg') || ! $this->file:
+            case empty($sapi)
+                || str_starts_with($sapi, 'cli')
+                || str_starts_with($sapi, 'phpdbg')
+                || $this->file === null:
                 // Non-SAPI environment, or no filename present
                 $this->writeFile($targetPath);
 
diff --git a/src/UriFactory.php b/src/UriFactory.php
@@ -60,7 +60,7 @@ public static function createFromSapi(array $server, array $headers): Uri
         [$host, $port] = self::marshalHostAndPort($server, $headers);
         if (! empty($host)) {
             $uri = $uri->withHost($host);
-            if (! empty($port)) {
+            if ($port !== null) {
                 $uri = $uri->withPort($port);
             }
         }
@@ -115,7 +115,7 @@ private static function getHeaderFromArray(string $name, array $headers, $defaul
      * Marshal the host and port from the PHP environment.
      *
      * @param array<string, string|list<string>> $headers
-     * @return array{string, int|null} Array of two items, host and port,
+     * @return array{0:string, 1:int|null} Array of two items, host and port,
      *     in that order (can be passed to a list() operation).
      */
     private static function marshalHostAndPort(array $server, array $headers): array
@@ -162,7 +162,7 @@ private static function marshalHostAndPort(array $server, array $headers): array
     private static function marshalIpv6HostAndPort(array $server, ?int $port): array
     {
         $host             = '[' . (string) $server['SERVER_ADDR'] . ']';
-        $port             = $port ?: 80;
+        $port             = $port ?? 80;
         $portSeparatorPos = strrpos($host, ':');
 
         if (false === $portSeparatorPos) {
diff --git a/test/ResponseTest.php b/test/ResponseTest.php
@@ -73,7 +73,7 @@ private function fetchIanaStatusCodes(): DOMDocument
             }
         }
         if ($ianaHttpStatusCodes) {
-            if (! getenv('ALWAYS_REFRESH_IANA_HTTP_STATUS_CODES')) {
+            if (getenv('ALWAYS_REFRESH_IANA_HTTP_STATUS_CODES') === 'false') {
                 // use cached codes
                 return $ianaHttpStatusCodes;
             }
@@ -82,7 +82,7 @@ private function fetchIanaStatusCodes(): DOMDocument
 
             $updatedQueryResult = $xpath->query('//ns:updated');
             if ($updatedQueryResult !== false && $updatedQueryResult->length > 0) {
-                $updated = $updatedQueryResult->item(0)?->nodeValue ?: '';
+                $updated = $updatedQueryResult->item(0)?->nodeValue ?? '';
                 $updated = strtotime($updated);
             }
         }
@@ -91,7 +91,7 @@ private function fetchIanaStatusCodes(): DOMDocument
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_TIMEOUT, 30);
         curl_setopt($ch, CURLOPT_USERAGENT, 'PHP Curl');
-        if ($updated) {
+        if ($updated !== null) {
             $ifModifiedSince = sprintf(
                 'If-Modified-Since: %s',
                 gmdate('D, d M Y H:i:s \G\M\T', $updated)
@@ -142,8 +142,8 @@ public function ianaCodesReasonPhrasesProvider(): array
                 continue;
             }
 
-            $value       = $valueQueryResult->item(0)?->nodeValue ?: '';
-            $description = $descriptionQueryResult->item(0)?->nodeValue ?: '';
+            $value       = $valueQueryResult->item(0)?->nodeValue ?? '';
+            $description = $descriptionQueryResult->item(0)?->nodeValue ?? '';
 
             if (in_array($description, ['Unassigned', '(Unused)'], true)) {
                 continue;
diff --git a/test/StreamTest.php b/test/StreamTest.php
@@ -27,6 +27,7 @@
 use function fwrite;
 use function imagecreate;
 use function is_resource;
+use function is_string;
 use function shmop_open;
 use function stream_get_meta_data;
 use function sys_get_temp_dir;
@@ -51,7 +52,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        if ($this->tmpnam && file_exists($this->tmpnam)) {
+        if (is_string($this->tmpnam) && file_exists($this->tmpnam)) {
             unlink($this->tmpnam);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ protected static function splitStream(StreamInterface $stream): array`
`99`	`99`	`continue;`
`100`	`100`	`}`
`101`	`101`
`102`		`- if (! $currentHeader) {`
	`102`	`+ if ($currentHeader === false) {`
`103`	`103`	`throw Exception\DeserializationException::forInvalidHeader();`
`104`	`104`	`}`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function tell(): int`
`84`	`84`	`*/`
`85`	`85`	`public function eof(): bool`
`86`	`86`	`{`
`87`		`- return empty($this->callback);`
	`87`	`+ return $this->callback === null;`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`/**`
`@@ -149,7 +149,7 @@ public function read(int $length): string`
`149`	`149`	`public function getContents(): string`
`150`	`150`	`{`
`151`	`151`	`$callback = $this->detach();`
`152`		`- $contents = $callback ? $callback() : '';`
	`152`	`+ $contents = $callback !== null ? $callback() : '';`
`153`	`153`	`return (string) $contents;`
`154`	`154`	`}`
`155`	`155`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ public function withUri(UriInterface $uri, bool $preserveHost = false): RequestI`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`$host = $uri->getHost();`
`255`		`- if ($uri->getPort()) {`
	`255`	`+ if ($uri->getPort() !== null) {`
`256`	`256`	`$host .= ':' . $uri->getPort();`
`257`	`257`	`}`
`258`	`258`
`@@ -294,7 +294,7 @@ private function setMethod(string $method): void`
`294`	`294`	`private function getHostFromUri(): string`
`295`	`295`	`{`
`296`	`296`	`$host = $this->uri->getHost();`
`297`		`- $host .= $this->uri->getPort() ? ':' . $this->uri->getPort() : '';`
	`297`	`+ $host .= $this->uri->getPort() !== null ? ':' . $this->uri->getPort() : '';`
`298`	`298`	`return $host;`
`299`	`299`	`}`
`300`	`300`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public static function createFromSapi(array $server, array $headers): Uri`
`60`	`60`	`[$host, $port] = self::marshalHostAndPort($server, $headers);`
`61`	`61`	`if (! empty($host)) {`
`62`	`62`	`$uri = $uri->withHost($host);`
`63`		`- if (! empty($port)) {`
	`63`	`+ if ($port !== null) {`
`64`	`64`	`$uri = $uri->withPort($port);`
`65`	`65`	`}`
`66`	`66`	`}`
`@@ -115,7 +115,7 @@ private static function getHeaderFromArray(string $name, array $headers, $defaul`
`115`	`115`	`* Marshal the host and port from the PHP environment.`
`116`	`116`	`*`
`117`	`117`	`* @param array<string, string\|list<string>> $headers`
`118`		`- * @return array{string, int\|null} Array of two items, host and port,`
	`118`	`+ * @return array{0:string, 1:int\|null} Array of two items, host and port,`
`119`	`119`	`* in that order (can be passed to a list() operation).`
`120`	`120`	`*/`
`121`	`121`	`private static function marshalHostAndPort(array $server, array $headers): array`
`@@ -162,7 +162,7 @@ private static function marshalHostAndPort(array $server, array $headers): array`
`162`	`162`	`private static function marshalIpv6HostAndPort(array $server, ?int $port): array`
`163`	`163`	`{`
`164`	`164`	`$host = '[' . (string) $server['SERVER_ADDR'] . ']';`
`165`		`- $port = $port ?: 80;`
	`165`	`+ $port = $port ?? 80;`
`166`	`166`	`$portSeparatorPos = strrpos($host, ':');`
`167`	`167`
`168`	`168`	`if (false === $portSeparatorPos) {`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ private function fetchIanaStatusCodes(): DOMDocument`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`if ($ianaHttpStatusCodes) {`
`76`		`- if (! getenv('ALWAYS_REFRESH_IANA_HTTP_STATUS_CODES')) {`
	`76`	`+ if (getenv('ALWAYS_REFRESH_IANA_HTTP_STATUS_CODES') === 'false') {`
`77`	`77`	`// use cached codes`
`78`	`78`	`return $ianaHttpStatusCodes;`
`79`	`79`	`}`
`@@ -82,7 +82,7 @@ private function fetchIanaStatusCodes(): DOMDocument`
`82`	`82`
`83`	`83`	`$updatedQueryResult = $xpath->query('//ns:updated');`
`84`	`84`	`if ($updatedQueryResult !== false && $updatedQueryResult->length > 0) {`
`85`		`- $updated = $updatedQueryResult->item(0)?->nodeValue ?: '';`
	`85`	`+ $updated = $updatedQueryResult->item(0)?->nodeValue ?? '';`
`86`	`86`	`$updated = strtotime($updated);`
`87`	`87`	`}`
`88`	`88`	`}`
`@@ -91,7 +91,7 @@ private function fetchIanaStatusCodes(): DOMDocument`
`91`	`91`	`curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);`
`92`	`92`	`curl_setopt($ch, CURLOPT_TIMEOUT, 30);`
`93`	`93`	`curl_setopt($ch, CURLOPT_USERAGENT, 'PHP Curl');`
`94`		`- if ($updated) {`
	`94`	`+ if ($updated !== null) {`
`95`	`95`	`$ifModifiedSince = sprintf(`
`96`	`96`	`'If-Modified-Since: %s',`
`97`	`97`	`gmdate('D, d M Y H:i:s \G\M\T', $updated)`
`@@ -142,8 +142,8 @@ public function ianaCodesReasonPhrasesProvider(): array`
`142`	`142`	`continue;`
`143`	`143`	`}`
`144`	`144`
`145`		`- $value = $valueQueryResult->item(0)?->nodeValue ?: '';`
`146`		`- $description = $descriptionQueryResult->item(0)?->nodeValue ?: '';`
	`145`	`+ $value = $valueQueryResult->item(0)?->nodeValue ?? '';`
	`146`	`+ $description = $descriptionQueryResult->item(0)?->nodeValue ?? '';`
`147`	`147`
`148`	`148`	`if (in_array($description, ['Unassigned', '(Unused)'], true)) {`
`149`	`149`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`use function fwrite;`
`28`	`28`	`use function imagecreate;`
`29`	`29`	`use function is_resource;`
	`30`	`+use function is_string;`
`30`	`31`	`use function shmop_open;`
`31`	`32`	`use function stream_get_meta_data;`
`32`	`33`	`use function sys_get_temp_dir;`
`@@ -51,7 +52,7 @@ protected function setUp(): void`
`51`	`52`
`52`	`53`	`protected function tearDown(): void`
`53`	`54`	`{`
`54`		`- if ($this->tmpnam && file_exists($this->tmpnam)) {`
	`55`	`+ if (is_string($this->tmpnam) && file_exists($this->tmpnam)) {`
`55`	`56`	`unlink($this->tmpnam);`
`56`	`57`	`}`
`57`	`58`	`}`