Skip to content

Commit dbfe47b

Browse files
committed
Merge branch '2.19.x' into 3.1.x
* 2.19.x: Psalm 5.24.0 (#11467) PHPStan 1.11.1 (#11466)
2 parents a90ee5c + d31aabb commit dbfe47b

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
"require-dev": {
3939
"doctrine/coding-standard": "^12.0",
4040
"phpbench/phpbench": "^1.0",
41-
"phpstan/phpstan": "1.10.59",
41+
"phpstan/phpstan": "1.11.1",
4242
"phpunit/phpunit": "^10.4.0",
4343
"psr/log": "^1 || ^2 || ^3",
4444
"squizlabs/php_codesniffer": "3.7.2",
4545
"symfony/cache": "^5.4 || ^6.2 || ^7.0",
46-
"vimeo/psalm": "5.22.2"
46+
"vimeo/psalm": "5.24.0"
4747
},
4848
"suggest": {
4949
"ext-dom": "Provides support for XSD validation for XML mapping files",

psalm-baseline.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
2+
<files psalm-version="5.24.0@462c80e31c34e58cc4f750c656be3927e80e550e">
33
<file src="src/AbstractQuery.php">
44
<FalsableReturnStatement>
55
<code><![CDATA[! $filteredParameters->isEmpty() ? $filteredParameters->first() : null]]></code>
@@ -206,6 +206,11 @@
206206
<code><![CDATA[$entity]]></code>
207207
</PossiblyNullArgument>
208208
</file>
209+
<file src="src/Id/SequenceGenerator.php">
210+
<ParamNameMismatch>
211+
<code><![CDATA[$serialized]]></code>
212+
</ParamNameMismatch>
213+
</file>
209214
<file src="src/Internal/Hydration/AbstractHydrator.php">
210215
<ReferenceConstraintViolation>
211216
<code><![CDATA[return $rowData;]]></code>

0 commit comments

Comments
 (0)