Skip to content

Commit 6b73943

Browse files
authored
Merge pull request #2931 from tarlepp/chore(deps)/psalm-major-update
Chore(deps) - Psalm major version update
2 parents f16d70a + 8528805 commit 6b73943

File tree

4 files changed

+1307
-191
lines changed

4 files changed

+1307
-191
lines changed

src/Utils/JSON.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ class JSON
2424
* @see http://php.net/manual/en/function.json-encode.php
2525
* @see http://php.net/manual/en/function.json-last-error.php
2626
*
27+
* @psalm-suppress FalsableReturnStatement
28+
* @psalm-suppress InvalidFalsableReturnType
29+
*
2730
* @param mixed $input The value being encoded. Can be any type except a resource.
2831
* @param int|null $options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS,
2932
* JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT,

tests/Unit/Utils/JSONTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@ public static function dataProviderTestThatDecodeThrowsAnExceptionOnMalformedJso
201201
/**
202202
* Data provider for 'testThatEncodeThrowsAnExceptionOnInvalidUtfCharacters'.
203203
*
204+
* @psalm-suppress MoreSpecificReturnType
205+
*
204206
* @return Generator<array{0: string}>
205207
*/
206208
public static function dataProviderTestThatEncodeThrowsAnExceptionOnInvalidUtfCharacters(): Generator

tools/03_psalm/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
},
88
"require-dev": {
99
"roave/security-advisories": "dev-latest",
10-
"psalm/plugin-phpunit": "0.19.0",
11-
"psalm/plugin-symfony": "5.2.6",
12-
"vimeo/psalm": "5.26.1",
13-
"weirdan/doctrine-psalm-plugin": "2.9.0"
10+
"psalm/plugin-phpunit": "0.19.2",
11+
"psalm/plugin-symfony": "5.2.7",
12+
"vimeo/psalm": "6.1.0",
13+
"weirdan/doctrine-psalm-plugin": "2.10.0"
1414
},
1515
"config": {
1616
"allow-plugins": true,

0 commit comments

Comments
 (0)