[2.6] Update deps (#609)

* Update deps * Fixes
guzzle · Jul 18, 2024 · 5b4d5ac · 5b4d5ac
1 parent a243f80
commit 5b4d5ac
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 50 deletions.
diff --git a/composer.json b/composer.json
@@ -61,8 +61,8 @@
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8.2",
-        "http-interop/http-factory-tests": "^0.9",
-        "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+        "http-interop/http-factory-tests": "0.9.0",
+        "phpunit/phpunit": "^8.5.39 || ^9.6.20"
     },
     "suggest": {
         "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -225,11 +225,6 @@ parameters:
 			count: 1
 			path: src/Utils.php
 
-		-
-			message: "#^Offset 'uri' on array\\{timed_out\\: bool, blocked\\: bool, eof\\: bool, unread_bytes\\: int, stream_type\\: string, wrapper_type\\: string, wrapper_data\\: mixed, mode\\: string, \\.\\.\\.\\} on left side of \\?\\? always exists and is not nullable\\.$#"
-			count: 1
-			path: src/Utils.php
-
 		-
 			message: "#^Parameter \\#1 \\$source of class GuzzleHttp\\\\Psr7\\\\PumpStream constructor expects callable\\(int\\)\\: \\(string\\|false\\|null\\), Closure\\(\\)\\: mixed given\\.$#"
 			count: 1

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -3,7 +3,9 @@ includes:
     - vendor-bin/phpstan/vendor/phpstan/phpstan-deprecation-rules/rules.neon
 
 parameters:
-    checkMissingIterableValueType: false
+    ignoreErrors:
+        -
+            identifier: missingType.iterableValue
     level: max
     paths:
         - src
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
+<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
   <file src="src/FnStream.php">
     <InvalidFunctionCall>
       <code><![CDATA[($this->_fn___toString)()]]></code>
@@ -21,77 +21,82 @@
   </file>
   <file src="src/Header.php">
     <PossiblyUndefinedArrayOffset>
-      <code>$m[0]</code>
+      <code><![CDATA[$m[0]]]></code>
     </PossiblyUndefinedArrayOffset>
   </file>
   <file src="src/HttpFactory.php">
     <ParamNameMismatch>
-      <code>$file</code>
+      <code><![CDATA[$file]]></code>
     </ParamNameMismatch>
   </file>
   <file src="src/Message.php">
+    <PossiblyNullArgument>
+      <code><![CDATA[$matches[1] === '/' ? self::parseRequestUri($parts[1], $data['headers']) : $parts[1]]]></code>
+      <code><![CDATA[$parts[1]]]></code>
+      <code><![CDATA[$parts[1]]]></code>
+    </PossiblyNullArgument>
     <PossiblyUndefinedArrayOffset>
-      <code>$parts[1]</code>
-      <code>$parts[1]</code>
-      <code>$parts[1]</code>
-      <code>$parts[1]</code>
+      <code><![CDATA[$parts[1]]]></code>
+      <code><![CDATA[$parts[1]]]></code>
+      <code><![CDATA[$parts[1]]]></code>
+      <code><![CDATA[$parts[1]]]></code>
     </PossiblyUndefinedArrayOffset>
   </file>
   <file src="src/MessageTrait.php">
     <LessSpecificImplementedReturnType>
-      <code>MessageInterface</code>
-      <code>MessageInterface</code>
-      <code>MessageInterface</code>
-      <code>MessageInterface</code>
-      <code>MessageInterface</code>
-      <code>array</code>
-      <code>array</code>
+      <code><![CDATA[MessageInterface]]></code>
+      <code><![CDATA[MessageInterface]]></code>
+      <code><![CDATA[MessageInterface]]></code>
+      <code><![CDATA[MessageInterface]]></code>
+      <code><![CDATA[MessageInterface]]></code>
+      <code><![CDATA[array]]></code>
+      <code><![CDATA[array]]></code>
     </LessSpecificImplementedReturnType>
     <ParamNameMismatch>
-      <code>$header</code>
-      <code>$header</code>
-      <code>$header</code>
-      <code>$header</code>
-      <code>$header</code>
-      <code>$header</code>
+      <code><![CDATA[$header]]></code>
+      <code><![CDATA[$header]]></code>
+      <code><![CDATA[$header]]></code>
+      <code><![CDATA[$header]]></code>
+      <code><![CDATA[$header]]></code>
+      <code><![CDATA[$header]]></code>
     </ParamNameMismatch>
   </file>
   <file src="src/Request.php">
     <NoValue>
-      <code>$header</code>
+      <code><![CDATA[$header]]></code>
     </NoValue>
   </file>
   <file src="src/Response.php">
     <RedundantCast>
-      <code>(int) $code</code>
-      <code>(string) $reasonPhrase</code>
+      <code><![CDATA[(int) $code]]></code>
+      <code><![CDATA[(string) $reasonPhrase]]></code>
     </RedundantCast>
   </file>
   <file src="src/ServerRequest.php">
     <InvalidArgument>
-      <code>$_SERVER['SERVER_PORT']</code>
+      <code><![CDATA[$_SERVER['SERVER_PORT']]]></code>
     </InvalidArgument>
     <InvalidArrayOffset>
-      <code>$normalizedFiles[$key]</code>
+      <code><![CDATA[$normalizedFiles[$key]]]></code>
     </InvalidArrayOffset>
     <InvalidReturnStatement>
-      <code>$normalizedFiles</code>
+      <code><![CDATA[$normalizedFiles]]></code>
     </InvalidReturnStatement>
     <InvalidReturnType>
-      <code>UploadedFileInterface[]</code>
+      <code><![CDATA[UploadedFileInterface[]]]></code>
     </InvalidReturnType>
     <ParamNameMismatch>
-      <code>$attribute</code>
-      <code>$attribute</code>
-      <code>$attribute</code>
+      <code><![CDATA[$attribute]]></code>
+      <code><![CDATA[$attribute]]></code>
+      <code><![CDATA[$attribute]]></code>
     </ParamNameMismatch>
   </file>
   <file src="src/Stream.php">
     <InvalidPropertyAssignmentValue>
       <code><![CDATA[$this->stream]]></code>
     </InvalidPropertyAssignmentValue>
     <RedundantCast>
-      <code>(int) $whence</code>
+      <code><![CDATA[(int) $whence]]></code>
     </RedundantCast>
     <RedundantPropertyInitializationCheck>
       <code><![CDATA[isset($this->stream)]]></code>
@@ -108,25 +113,25 @@
   </file>
   <file src="src/Uri.php">
     <PossiblyInvalidArgument>
-      <code>$result</code>
+      <code><![CDATA[$result]]></code>
     </PossiblyInvalidArgument>
   </file>
   <file src="src/UriResolver.php">
     <TypeDoesNotContainType>
-      <code>'' === $relativePath</code>
+      <code><![CDATA['' === $relativePath]]></code>
     </TypeDoesNotContainType>
   </file>
   <file src="src/Utils.php">
     <FalsableReturnStatement>
-      <code>$contents</code>
+      <code><![CDATA[$contents]]></code>
     </FalsableReturnStatement>
     <MissingDocblockType>
-      <code>throw $ex;</code>
-      <code>throw $ex;</code>
+      <code><![CDATA[throw $ex;]]></code>
+      <code><![CDATA[throw $ex;]]></code>
     </MissingDocblockType>
     <PossiblyUndefinedVariable>
-      <code>$contents</code>
-      <code>$handle</code>
+      <code><![CDATA[$contents]]></code>
+      <code><![CDATA[$handle]]></code>
     </PossiblyUndefinedVariable>
   </file>
 </files>
diff --git a/psalm.xml b/psalm.xml
@@ -6,6 +6,8 @@
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     errorBaseline="psalm-baseline.xml"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src" />

diff --git a/vendor-bin/php-cs-fixer/composer.json b/vendor-bin/php-cs-fixer/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.4 || ^8.0",
-        "friendsofphp/php-cs-fixer": "3.52.1"
+        "friendsofphp/php-cs-fixer": "3.59.3"
     },
     "config": {
         "preferred-install": "dist"

diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
@@ -1,8 +1,8 @@
 {
     "require": {
         "php": "^7.4 || ^8.0",
-        "phpstan/phpstan": "1.10.47",
-        "phpstan/phpstan-deprecation-rules": "1.1.4"
+        "phpstan/phpstan": "1.11.7",
+        "phpstan/phpstan-deprecation-rules": "1.2.0"
     },
     "config": {
         "preferred-install": "dist"

diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.4 || ^8.0",
-        "psalm/phar": "5.16.0"
+        "psalm/phar": "5.25.0"
     },
     "config": {
         "preferred-install": "dist"