Merge pull request #8635 from greg0ire/2.9.x

Manually merge 2.8.x into 2.9.x

composer.json

@@ -34,11 +34,11 @@
     },
     "require-dev": {
         "doctrine/coding-standard": "^9.0",
-        "phpstan/phpstan": "^0.12.18",
+        "phpstan/phpstan": "^0.12.83",
         "phpunit/phpunit": "^8.5|^9.4",
         "squizlabs/php_codesniffer": "3.6.0",
         "symfony/yaml": "^3.4|^4.0|^5.0",
-        "vimeo/psalm": "4.3.2"
+        "vimeo/psalm": "4.7.0"
     },
     "suggest": {
         "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"

phpstan-baseline.neon

@@ -775,6 +775,16 @@ parameters:
 			count: 1
 			path: lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
 
+		-
+			message: "#^Call to an undefined method ReflectionProperty\\:\\:getType\\(\\)\\.$#"
+			count: 2
+			path: lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+
+		-
+			message: "#^Call to an undefined method ReflectionProperty\\:\\:hasType\\(\\)\\.$#"
+			count: 1
+			path: lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+
 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Mapping\\\\NamingStrategy\\:\\:joinColumnName\\(\\) invoked with 2 parameters, 1 required\\.$#"
 			count: 2

phpstan.neon

@@ -8,3 +8,4 @@ parameters:
     earlyTerminatingMethodCalls:
         Doctrine\ORM\Query\Parser:
             - syntaxError
+    phpVersion: 70200

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.3.2@57b53ff26237074fdf5cbcb034f7da5172be4524">
+<files psalm-version="4.7.0@d4377c0baf3ffbf0b1ec6998e8d1be2a40971005">
   <file src="lib/Doctrine/ORM/AbstractQuery.php">
     <FalsableReturnStatement occurrences="1">
       <code>! $filteredParameters-&gt;isEmpty() ? $filteredParameters-&gt;first() : null</code>
@@ -346,6 +346,9 @@
     </FalsableReturnStatement>
   </file>
   <file src="lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php">
+    <InvalidArgument occurrences="1">
+      <code>$hints</code>
+    </InvalidArgument>
     <InvalidNullableReturnType occurrences="2">
       <code>loadById</code>
       <code>loadOneToOneEntity</code>
@@ -369,9 +372,6 @@
       <code>$paramMappings</code>
       <code>$sqlPositions</code>
     </InvalidArgument>
-    <InvalidArrayOffset occurrences="1">
-      <code>$value[$i % $countValue]</code>
-    </InvalidArrayOffset>
     <LessSpecificImplementedReturnType occurrences="1">
       <code>mixed</code>
     </LessSpecificImplementedReturnType>
@@ -558,13 +558,10 @@
     <NullableReturnStatement occurrences="1">
       <code>$this-&gt;identityMap[$rootClassName][$idHash]</code>
     </NullableReturnStatement>
-    <UndefinedInterfaceMethod occurrences="6">
+    <UndefinedInterfaceMethod occurrences="3">
       <code>getMapping</code>
       <code>getMapping</code>
       <code>takeSnapshot</code>
-      <code>unwrap</code>
-      <code>unwrap</code>
-      <code>unwrap</code>
     </UndefinedInterfaceMethod>
   </file>
 </files>