Skip to content

Commit a9c83f4

Browse files
committed
Fix some psalm findings
1 parent 411c81b commit a9c83f4

File tree

5 files changed

+14
-4
lines changed

5 files changed

+14
-4
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ public function testFacetThrowsExceptionWithoutFieldName()
6666
$facetStage->pipeline($this->getTestAggregationBuilder());
6767
}
6868

69+
/**
70+
* @psalm-suppress InvalidArgument on purpose to throw exception
71+
*/
6972
public function testFacetThrowsExceptionOnInvalidPipeline()
7073
{
7174
$facetStage = new Facet($this->getTestAggregationBuilder());

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,8 @@ abstract class AbstractVersionBase
570570
/** @ODM\EmbedMany(targetDocument=Issue::class) */
571571
public $issues;
572572

573+
public $version;
574+
573575
public function __construct($title = null)
574576
{
575577
$this->issues = new ArrayCollection();

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Doctrine\ODM\MongoDB\Tests\Functional;
66

7+
use Doctrine\ODM\MongoDB\Iterator\Iterator;
78
use Doctrine\ODM\MongoDB\Tests\BaseTest;
89
use Documents\Article;
910
use Documents\CmsComment;
@@ -18,6 +19,7 @@
1819
use MongoDB\BSON\UTCDateTime;
1920

2021
use function array_values;
22+
use function assert;
2123
use function get_class;
2224
use function iterator_to_array;
2325
use function strtotime;
@@ -396,7 +398,11 @@ public function testNestedQueryReference()
396398
->field('indirectlyReferencedUsers.user.id')->equals(new ObjectId($referencedUser->getId()))
397399
->getQuery();
398400

399-
$referencedUsers = iterator_to_array($referencedUsersQuery->execute(), false);
401+
$referencedUsersIterator = $referencedUsersQuery->execute();
402+
403+
assert($referencedUsersIterator instanceof Iterator);
404+
405+
$referencedUsers = iterator_to_array($referencedUsersIterator, false);
400406

401407
$this->assertCount(1, $referencedUsers);
402408
$this->assertSame($user, $referencedUsers[0]);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function testEmbedMany()
146146
$this->assertBsonArray($doc->id, 'embedManyAddToSet');
147147

148148
// Check that the value is changed properly
149-
unset($colPush[1], $colSet[1], $colSetArray[1], $colAddToSet['1']);
149+
unset($colPush[1], $colSet[1], $colSetArray[1], $colAddToSet[1]);
150150
$doc = $this->dm->merge($doc);
151151
$doc->embedManyPush = $colPush;
152152
$doc->embedManySet = $colSet;

tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,8 +418,7 @@ public function testSetFieldValueWithProxy()
418418

419419
public function testSetCustomRepositoryClass()
420420
{
421-
$cm = new ClassMetadata(self::class);
422-
$cm->namespace = 'Doctrine\ODM\MongoDB\Tests\Mapping';
421+
$cm = new ClassMetadata(self::class);
423422

424423
$cm->setCustomRepositoryClass(Repository::class);
425424

0 commit comments

Comments
 (0)