Merge pull request #2332 from franmomu/psalm_to_level_6_mix

Fix some psalm findings

Author: malarzm

lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php

@@ -1309,6 +1309,9 @@ public function getReflectionProperty(string $name): ReflectionProperty
         return $this->reflFields[$name];
     }
 
+    /**
+     * @psalm-return class-string<T>
+     */
     public function getName(): string
     {
         return $this->name;

lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php

@@ -120,6 +120,9 @@ final class DocumentPersister
     /** @var HydratorFactory */
     private $hydratorFactory;
 
+    /**
+     * @psalm-param ClassMetadata<T> $class
+     */
     public function __construct(
         PersistenceBuilder $pb,
         DocumentManager $dm,

lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/CreateCommand.php

@@ -39,8 +39,8 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $create = array_filter($this->createOrder, static function ($option) use ($input) {
-            return $input->getOption($option);
+        $create = array_filter($this->createOrder, static function (string $option) use ($input): bool {
+            return (bool) $input->getOption($option);
         });
 
         // Default to the full creation order if no options were specified

lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/DropCommand.php

@@ -36,8 +36,8 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $drop = array_filter($this->dropOrder, static function ($option) use ($input) {
-            return $input->getOption($option);
+        $drop = array_filter($this->dropOrder, static function (string $option) use ($input): bool {
+            return (bool) $input->getOption($option);
         });
 
         // Default to the full drop order if no options were specified

phpstan-baseline.neon

@@ -114,11 +114,6 @@ parameters:
             count: 2
             path: tests/Doctrine/ODM/MongoDB/Tests/Functional/InheritanceTest.php
 
-        -
-            message: "#^Access to an undefined property Doctrine\\\\ODM\\\\MongoDB\\\\Tests\\\\Functional\\\\AbstractVersionBase\\:\\:\\$version\\.$#"
-            count: 1
-            path: tests/Doctrine/ODM/MongoDB/Tests/Functional/LockTest.php
-
         -
             message: "#^Cannot access property \\$blogPosts on array\\|object\\.$#"
             count: 2
@@ -149,16 +144,6 @@ parameters:
             count: 1
             path: tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH267Test.php
 
-        -
-            message: "#^Cannot assign offset '1' to Doctrine\\\\Common\\\\Collections\\\\ArrayCollection\\<int, mixed\\>\\.$#"
-            count: 1
-            path: tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH453Test.php
-
-        -
-            message: "#^Cannot unset offset '1' on Doctrine\\\\Common\\\\Collections\\\\ArrayCollection\\<int, mixed\\>\\.$#"
-            count: 1
-            path: tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH453Test.php
-
         -
             message: "#^Cannot access property \\$ref on array\\|object\\.$#"
             count: 2
@@ -204,11 +189,6 @@ parameters:
             count: 1
             path: tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataLoadEventTest.php
 
-        -
-            message: "#^Access to an undefined property Doctrine\\\\ODM\\\\MongoDB\\\\Mapping\\\\ClassMetadata\\<Doctrine\\\\ODM\\\\MongoDB\\\\Tests\\\\Mapping\\\\ClassMetadataTest\\>\\:\\:\\$namespace\\.$#"
-            count: 1
-            path: tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php
-
         -
             message: "#^Parameter \\#1 \\$primer of method Doctrine\\\\ODM\\\\MongoDB\\\\Query\\\\Builder\\:\\:prime\\(\\) expects bool\\|\\(callable\\(\\)\\: mixed\\), 1 given\\.$#"
             count: 1

tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/FacetTest.php

@@ -66,6 +66,9 @@ public function testFacetThrowsExceptionWithoutFieldName()
         $facetStage->pipeline($this->getTestAggregationBuilder());
     }
 
+    /**
+     * @psalm-suppress InvalidArgument on purpose to throw exception
+     */
     public function testFacetThrowsExceptionOnInvalidPipeline()
     {
         $facetStage = new Facet($this->getTestAggregationBuilder());

tests/Doctrine/ODM/MongoDB/Tests/Functional/LockTest.php

@@ -570,6 +570,8 @@ abstract class AbstractVersionBase
     /** @ODM\EmbedMany(targetDocument=Issue::class) */
     public $issues;
 
+    public $version;
+
     public function __construct($title = null)
     {
         $this->issues = new ArrayCollection();

tests/Doctrine/ODM/MongoDB/Tests/Functional/MemoryUsageTest.php

@@ -61,6 +61,6 @@ private function formatMemory($size)
     {
         $unit = ['b', 'kb', 'mb', 'gb', 'tb', 'pb'];
 
-        return round($size / pow(1024, ($i = floor(log($size, 1024)))), 2) . ' ' . $unit[$i];
+        return round($size / pow(1024, ($i = (int) floor(log($size, 1024)))), 2) . ' ' . $unit[$i];
     }
 }

tests/Doctrine/ODM/MongoDB/Tests/Functional/QueryTest.php

@@ -4,6 +4,7 @@
 
 namespace Doctrine\ODM\MongoDB\Tests\Functional;
 
+use Doctrine\ODM\MongoDB\Iterator\Iterator;
 use Doctrine\ODM\MongoDB\Tests\BaseTest;
 use Documents\Article;
 use Documents\CmsComment;
@@ -18,6 +19,7 @@
 use MongoDB\BSON\UTCDateTime;
 
 use function array_values;
+use function assert;
 use function get_class;
 use function iterator_to_array;
 use function strtotime;
@@ -396,7 +398,11 @@ public function testNestedQueryReference()
             ->field('indirectlyReferencedUsers.user.id')->equals(new ObjectId($referencedUser->getId()))
             ->getQuery();
 
-        $referencedUsers = iterator_to_array($referencedUsersQuery->execute(), false);
+        $referencedUsersIterator = $referencedUsersQuery->execute();
+
+        assert($referencedUsersIterator instanceof Iterator);
+
+        $referencedUsers = iterator_to_array($referencedUsersIterator, false);
 
         $this->assertCount(1, $referencedUsers);
         $this->assertSame($user, $referencedUsers[0]);

tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH453Test.php

@@ -146,7 +146,7 @@ public function testEmbedMany()
         $this->assertBsonArray($doc->id, 'embedManyAddToSet');
 
         // Check that the value is changed properly
-        unset($colPush[1], $colSet[1], $colSetArray[1], $colAddToSet['1']);
+        unset($colPush[1], $colSet[1], $colSetArray[1], $colAddToSet[1]);
         $doc                    = $this->dm->merge($doc);
         $doc->embedManyPush     = $colPush;
         $doc->embedManySet      = $colSet;