From 581375dae9dd1e74fc6ae6d71956c5c2f93de75a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <gregoire.paris@manomano.com>
Date: Wed, 4 Jan 2023 13:18:59 +0100
Subject: [PATCH] Use a more accurate type

getFixtures() doesn't always return instances of OrderedFixtureInterface
(for instance if you don't use those at all).
---
 lib/Doctrine/Common/DataFixtures/Loader.php | 4 ++--
 phpstan-baseline.neon                       | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/Doctrine/Common/DataFixtures/Loader.php b/lib/Doctrine/Common/DataFixtures/Loader.php
index 3918ec26..9ae3aa8b 100644
--- a/lib/Doctrine/Common/DataFixtures/Loader.php
+++ b/lib/Doctrine/Common/DataFixtures/Loader.php
@@ -47,7 +47,7 @@ class Loader
     /**
      * Array of ordered fixture object instances.
      *
-     * @psalm-var array<class-string<OrderedFixtureInterface>, OrderedFixtureInterface>|list<OrderedFixtureInterface>
+     * @psalm-var array<class-string<FixtureInterface>|int, FixtureInterface>
      */
     private $orderedFixtures = [];
 
@@ -181,7 +181,7 @@ public function addFixture(FixtureInterface $fixture)
     /**
      * Returns the array of data fixtures to execute.
      *
-     * @psalm-return array<class-string<OrderedFixtureInterface>|int, OrderedFixtureInterface>
+     * @psalm-return array<class-string<FixtureInterface>|int, FixtureInterface>
      */
     public function getFixtures()
     {
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 9f45270d..b0b443c3 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -25,11 +25,6 @@ parameters:
 			count: 1
 			path: lib/Doctrine/Common/DataFixtures/Loader.php
 
-		-
-			message: "#^Property Doctrine\\\\Common\\\\DataFixtures\\\\Loader\\:\\:\\$orderedFixtures \\(array\\<class\\-string\\<Doctrine\\\\Common\\\\DataFixtures\\\\OrderedFixtureInterface\\>\\|int, Doctrine\\\\Common\\\\DataFixtures\\\\OrderedFixtureInterface\\>\\) does not accept array\\<class\\-string\\<Doctrine\\\\Common\\\\DataFixtures\\\\FixtureInterface\\>, Doctrine\\\\Common\\\\DataFixtures\\\\FixtureInterface\\>\\.$#"
-			count: 2
-			path: lib/Doctrine/Common/DataFixtures/Loader.php
-
 		-
 			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:getReference\\(\\)\\.$#"
 			count: 2