Skip to content

Commit 40a2038

Browse files
committed
Merge branch '2.10.x' into 2.11.x
* 2.10.x: Run PHP CodeSniffer on PHP 8.1 (#9317) Psalm 4.17.0 (#9315)
2 parents 5901848 + 8b5ee54 commit 40a2038

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

.github/workflows/coding-standard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ jobs:
1212
coding-standards:
1313
uses: "doctrine/.github/.github/workflows/[email protected]"
1414
with:
15-
php-version: "7.4"
15+
php-version: "8.1"

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"squizlabs/php_codesniffer": "3.6.2",
4949
"symfony/cache": "^4.4 || ^5.4 || ^6.0",
5050
"symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
51-
"vimeo/psalm": "4.16.1"
51+
"vimeo/psalm": "4.17.0"
5252
},
5353
"conflict": {
5454
"doctrine/annotations": "<1.13 || >= 2.0"

psalm-baseline.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.16.1@aa7e400908833b10c0333861f86cd48c510b60eb">
2+
<files psalm-version="4.17.0@6f4707aa41c9174353a6434bba3fc8840f981d9c">
33
<file src="lib/Doctrine/ORM/AbstractQuery.php">
44
<DeprecatedClass occurrences="1">
55
<code>IterableResult</code>
@@ -3342,10 +3342,6 @@
33423342
<DeprecatedClass occurrences="1">
33433343
<code>AbstractExporter</code>
33443344
</DeprecatedClass>
3345-
<MissingClosureParamType occurrences="2">
3346-
<code>$m1</code>
3347-
<code>$m2</code>
3348-
</MissingClosureParamType>
33493345
<NonInvariantDocblockPropertyType occurrences="1">
33503346
<code>$_extension</code>
33513347
</NonInvariantDocblockPropertyType>

0 commit comments

Comments
 (0)