Merge branch '2.13.x' into 3.0.x

* 2.13.x: Psalm 4.24.0, PHPStan 1.7.15 (#9865) PHP CodeSniffer 3.7.1, PHPStan 1.7.14 (#9858)
doctrine · Jun 28, 2022 · 9e0c7de · 9e0c7de
2 parents 07fa660 + dc8ddfd
commit 9e0c7de
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -39,12 +39,12 @@
         "doctrine/annotations": "^1.13",
         "doctrine/coding-standard": "^9.0",
         "phpbench/phpbench": "^1.0",
-        "phpstan/phpstan": "1.7.13",
+        "phpstan/phpstan": "1.7.15",
         "phpunit/phpunit": "^9.5",
         "psr/log": "^1 || ^2 || ^3",
-        "squizlabs/php_codesniffer": "3.7.0",
+        "squizlabs/php_codesniffer": "3.7.1",
         "symfony/cache": "^4.4 || ^5.4 || ^6.0",
-        "vimeo/psalm": "4.23.0"
+        "vimeo/psalm": "4.24.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.13 || >= 2.0"

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.23.0@f1fe6ff483bf325c803df9f510d09a03fd796f88">
+<files psalm-version="4.24.0@06dd975cb55d36af80f242561738f16c5f58264f">
   <file src="lib/Doctrine/ORM/AbstractQuery.php">
     <FalsableReturnStatement occurrences="1">
       <code>! $filteredParameters-&gt;isEmpty() ? $filteredParameters-&gt;first() : null</code>
@@ -43,9 +43,6 @@
     </NullableReturnStatement>
   </file>
   <file src="lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php">
-    <InvalidArgument occurrences="1">
-      <code>$em-&gt;getMetadataFactory()</code>
-    </InvalidArgument>
     <PossiblyNullArrayOffset occurrences="1">
       <code>$targetClassMetadata-&gt;associationMappings</code>
     </PossiblyNullArrayOffset>
@@ -423,16 +420,21 @@
       <code>protected function _validateAndCompleteManyToManyMapping(array $mapping)</code>
       <code>protected function _validateAndCompleteOneToOneMapping(array $mapping)</code>
     </InvalidDocblock>
-    <InvalidNullableReturnType occurrences="4">
+    <InvalidNullableReturnType occurrences="3">
       <code>ReflectionProperty</code>
       <code>ReflectionProperty</code>
-      <code>getReflectionClass</code>
       <code>string</code>
     </InvalidNullableReturnType>
     <InvalidPropertyAssignmentValue occurrences="2">
       <code>$definition</code>
       <code>$this-&gt;subClasses</code>
     </InvalidPropertyAssignmentValue>
+    <InvalidReturnStatement occurrences="1">
+      <code>$this-&gt;reflClass</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="1">
+      <code>getReflectionClass</code>
+    </InvalidReturnType>
     <LessSpecificReturnStatement occurrences="4">
       <code>$cache</code>
       <code>$className</code>
@@ -1015,8 +1017,7 @@
     <DocblockTypeContradiction occurrences="1">
       <code>$value === null</code>
     </DocblockTypeContradiction>
-    <InvalidArgument occurrences="2">
-      <code>$em-&gt;getMetadataFactory()</code>
+    <InvalidArgument occurrences="1">
       <code>$hints</code>
     </InvalidArgument>
     <InvalidScalarArgument occurrences="4">
@@ -1134,10 +1135,8 @@
       <code>$classMetadata</code>
       <code>$classMetadata</code>
     </ArgumentTypeCoercion>
-    <InvalidArgument occurrences="3">
+    <InvalidArgument occurrences="1">
       <code>$classMetadata-&gt;getReflectionProperties()</code>
-      <code>$em-&gt;getMetadataFactory()</code>
-      <code>$em-&gt;getMetadataFactory()</code>
     </InvalidArgument>
     <NoInterfaceProperties occurrences="2">
       <code>$metadata-&gt;isEmbeddedClass</code>
@@ -2378,9 +2377,6 @@
       <code>$collectionToUpdate</code>
       <code>$commitOrder[$i]</code>
     </ArgumentTypeCoercion>
-    <InvalidArgument occurrences="1">
-      <code>$em-&gt;getMetadataFactory()</code>
-    </InvalidArgument>
     <InvalidNullableReturnType occurrences="1">
       <code>object</code>
     </InvalidNullableReturnType>
@@ -2458,8 +2454,7 @@
       <code>$assoc['mappedBy']</code>
       <code>$assoc['orphanRemoval']</code>
     </PossiblyUndefinedArrayOffset>
-    <PossiblyUndefinedMethod occurrences="4">
-      <code>addPropertyChangedListener</code>
+    <PossiblyUndefinedMethod occurrences="3">
       <code>unwrap</code>
       <code>unwrap</code>
       <code>unwrap</code>