Merge branch '2.11.x' into 3.0.x

* 2.11.x: Run PHP CodeSniffer on PHP 8.1 (doctrine#9317) Psalm 4.17.0 (doctrine#9315) Run static analysis on PHP 8.1 (doctrine#9310)
derrabus · Jan 2, 2022 · 580914f · 580914f
2 parents f151daa + 40a2038
commit 580914f
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 19 deletions.
diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml
@@ -12,4 +12,4 @@ jobs:
   coding-standards:
     uses: "doctrine/.github/.github/workflows/[email protected]"
     with:
-      php-version: "8.0"
+      php-version: "8.1"
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
         dbal-version:
           - "default"
 
@@ -53,7 +53,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
         dbal-version:
           - "default"
 

diff --git a/composer.json b/composer.json
@@ -45,7 +45,7 @@
         "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "3.6.2",
         "symfony/cache": "^4.4 || ^5.4 || ^6.0",
-        "vimeo/psalm": "4.16.1"
+        "vimeo/psalm": "4.17.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.13 || >= 2.0"

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -585,6 +585,11 @@ parameters:
 			count: 1
 			path: lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
 
+		-
+			message: "#^Parameter \\#2 \\$lockMode of method Doctrine\\\\DBAL\\\\Platforms\\\\AbstractPlatform\\:\\:appendLockHint\\(\\) expects 0\\|1\\|2\\|4, int given\\.$#"
+			count: 2
+			path: lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
+
 		-
 			message: "#^Parameter \\#3 \\$hints of method Doctrine\\\\ORM\\\\Internal\\\\Hydration\\\\AbstractHydrator\\:\\:hydrateAll\\(\\) expects array\\<string, string\\>, array\\<string, Doctrine\\\\ORM\\\\PersistentCollection\\|true\\> given\\.$#"
 			count: 1
@@ -620,6 +625,11 @@ parameters:
 			count: 1
 			path: lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php
 
+		-
+			message: "#^Parameter \\#2 \\$lockMode of method Doctrine\\\\DBAL\\\\Platforms\\\\AbstractPlatform\\:\\:appendLockHint\\(\\) expects 0\\|1\\|2\\|4, int given\\.$#"
+			count: 1
+			path: lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php
+
 		-
 			message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isEmbeddedClass\\.$#"
 			count: 1
@@ -821,18 +831,17 @@ parameters:
 			path: lib/Doctrine/ORM/Query/Parser.php
 
 		-
-			message:
-				"""
-					#^PHPDoc tag @return has invalid value \\(AST\\\\BetweenExpression\\|
-					        AST\\\\CollectionMemberExpression\\|
-					        AST\\\\ComparisonExpression\\|
-					        AST\\\\EmptyCollectionComparisonExpression\\|
-					        AST\\\\ExistsExpression\\|
-					        AST\\\\InExpression\\|
-					        AST\\\\InstanceOfExpression\\|
-					        AST\\\\LikeExpression\\|
-					        AST\\\\NullComparisonExpression\\)\\: Unexpected token "\\\\n     \\* ", expected type at offset 344$#
-				"""
+			message: """
+				#^PHPDoc tag @return has invalid value \\(AST\\\\BetweenExpression\\|
+				        AST\\\\CollectionMemberExpression\\|
+				        AST\\\\ComparisonExpression\\|
+				        AST\\\\EmptyCollectionComparisonExpression\\|
+				        AST\\\\ExistsExpression\\|
+				        AST\\\\InExpression\\|
+				        AST\\\\InstanceOfExpression\\|
+				        AST\\\\LikeExpression\\|
+				        AST\\\\NullComparisonExpression\\)\\: Unexpected token "\\\\n     \\* ", expected type at offset 344$#
+			"""
 			count: 1
 			path: lib/Doctrine/ORM/Query/Parser.php
 
@@ -1565,3 +1574,4 @@ parameters:
 			message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$subClasses\\.$#"
 			count: 1
 			path: lib/Doctrine/ORM/Utility/HierarchyDiscriminatorResolver.php
+
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.16.1@aa7e400908833b10c0333861f86cd48c510b60eb">
+<files psalm-version="4.17.0@6f4707aa41c9174353a6434bba3fc8840f981d9c">
   <file src="lib/Doctrine/ORM/AbstractQuery.php">
     <DeprecatedMethod occurrences="3">
       <code>getResultCacheDriver</code>
@@ -1429,7 +1429,9 @@
     </PossiblyUndefinedArrayOffset>
   </file>
   <file src="lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php">
-    <ArgumentTypeCoercion occurrences="1">
+    <ArgumentTypeCoercion occurrences="3">
+      <code>$lockMode ?? LockMode::NONE</code>
+      <code>$lockMode ?? LockMode::NONE</code>
       <code>$this-&gt;em</code>
     </ArgumentTypeCoercion>
     <DocblockTypeContradiction occurrences="1">
@@ -1512,7 +1514,8 @@
     </MissingReturnType>
   </file>
   <file src="lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php">
-    <ArgumentTypeCoercion occurrences="1">
+    <ArgumentTypeCoercion occurrences="2">
+      <code>$lockMode ?? LockMode::NONE</code>
       <code>$this-&gt;em</code>
     </ArgumentTypeCoercion>
     <LessSpecificReturnStatement occurrences="1">