Merge branch '2.12.x' into 2.13.x

* 2.12.x: Psalm 4.24.0, PHPStan 1.7.15 (#9865) PHP CodeSniffer 3.7.1, PHPStan 1.7.14 (#9858)
doctrine · Jun 28, 2022 · dc8ddfd · dc8ddfd
2 parents b931a59 + 278bf19
commit dc8ddfd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -42,13 +42,13 @@
         "doctrine/annotations": "^1.13",
         "doctrine/coding-standard": "^9.0",
         "phpbench/phpbench": "^0.16.10 || ^1.0",
-        "phpstan/phpstan": "~1.4.10 || 1.7.13",
+        "phpstan/phpstan": "~1.4.10 || 1.7.15",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^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",
         "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^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">
     <DeprecatedClass occurrences="1">
       <code>IterableResult</code>
@@ -609,16 +609,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>getAssociationMappedByTargetField</code>
-      <code>getReflectionClass</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>
@@ -816,8 +821,8 @@
       <code>assert($property instanceof ReflectionProperty)</code>
     </RedundantCondition>
     <RedundantConditionGivenDocblockType occurrences="2">
-      <code>assert($cacheAttribute instanceof Mapping\Cache)</code>
       <code>$metadata-&gt;getReflectionClass()</code>
+      <code>assert($cacheAttribute instanceof Mapping\Cache)</code>
     </RedundantConditionGivenDocblockType>
   </file>
   <file src="lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php">
@@ -2574,7 +2579,8 @@
     </RedundantConditionGivenDocblockType>
   </file>
   <file src="lib/Doctrine/ORM/Repository/DefaultRepositoryFactory.php">
-    <InvalidReturnStatement occurrences="1">
+    <InvalidReturnStatement occurrences="2">
+      <code>$this-&gt;repositoryList[$repositoryHash]</code>
       <code>$this-&gt;repositoryList[$repositoryHash] = $this-&gt;createRepository($entityManager, $entityName)</code>
     </InvalidReturnStatement>
     <InvalidReturnType occurrences="1">
@@ -2791,12 +2797,6 @@
     <InvalidDocblock occurrences="1">
       <code>public function setFieldVisibility($visibility)</code>
     </InvalidDocblock>
-    <MissingParamType occurrences="1">
-      <code>$visibility</code>
-    </MissingParamType>
-    <MissingReturnType occurrences="1">
-      <code>setFieldVisibility</code>
-    </MissingReturnType>
     <PossiblyFalseArgument occurrences="2">
       <code>$last</code>
       <code>strrpos($metadata-&gt;name, '\\')</code>
@@ -3217,8 +3217,7 @@
       <code>$assoc['orphanRemoval']</code>
       <code>$association['mappedBy']</code>
     </PossiblyUndefinedArrayOffset>
-    <PossiblyUndefinedMethod occurrences="4">
-      <code>addPropertyChangedListener</code>
+    <PossiblyUndefinedMethod occurrences="3">
       <code>unwrap</code>
       <code>unwrap</code>
       <code>unwrap</code>