Merge pull request #2931 from tarlepp/chore(deps)/psalm-major-update

Chore(deps) - Psalm major version update
tarlepp · Feb 7, 2025 · 6b73943 · 6b73943
2 parents f16d70a + 8528805
commit 6b73943
Show file tree

Hide file tree

Showing 4 changed files with 1,307 additions and 191 deletions.
diff --git a/src/Utils/JSON.php b/src/Utils/JSON.php
@@ -24,6 +24,9 @@ class JSON
      * @see http://php.net/manual/en/function.json-encode.php
      * @see http://php.net/manual/en/function.json-last-error.php
      *
+     * @psalm-suppress FalsableReturnStatement
+     * @psalm-suppress InvalidFalsableReturnType
+     *
      * @param mixed $input The value being encoded. Can be any type except a resource.
      * @param int|null $options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS,
      *                          JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT,

diff --git a/tests/Unit/Utils/JSONTest.php b/tests/Unit/Utils/JSONTest.php
@@ -201,6 +201,8 @@ public static function dataProviderTestThatDecodeThrowsAnExceptionOnMalformedJso
     /**
      * Data provider for 'testThatEncodeThrowsAnExceptionOnInvalidUtfCharacters'.
      *
+     * @psalm-suppress MoreSpecificReturnType
+     *
      * @return Generator<array{0: string}>
      */
     public static function dataProviderTestThatEncodeThrowsAnExceptionOnInvalidUtfCharacters(): Generator

diff --git a/tools/03_psalm/composer.json b/tools/03_psalm/composer.json
@@ -7,10 +7,10 @@
 	},
 	"require-dev": {
 		"roave/security-advisories": "dev-latest",
-		"psalm/plugin-phpunit": "0.19.0",
-		"psalm/plugin-symfony": "5.2.6",
-		"vimeo/psalm": "5.26.1",
-		"weirdan/doctrine-psalm-plugin": "2.9.0"
+		"psalm/plugin-phpunit": "0.19.2",
+		"psalm/plugin-symfony": "5.2.7",
+		"vimeo/psalm": "6.1.0",
+		"weirdan/doctrine-psalm-plugin": "2.10.0"
 	},
 	"config": {
 		"allow-plugins": true,