From 11fca8cd2e465fe8706b5df8279cecafd8fd5110 Mon Sep 17 00:00:00 2001
From: Toni Uebernickel <toni.uebernickel@ormigo.com>
Date: Thu, 16 Apr 2020 11:48:57 +0200
Subject: [PATCH] fixup! Enable loader to retrieve subtree of fixtures

---
 Loader/SymfonyFixturesLoader.php            |  3 +++
 Tests/Loader/ResolveFixturesSubtreeTest.php | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Loader/SymfonyFixturesLoader.php b/Loader/SymfonyFixturesLoader.php
index ca8a7fd3..90cfe4cf 100644
--- a/Loader/SymfonyFixturesLoader.php
+++ b/Loader/SymfonyFixturesLoader.php
@@ -13,6 +13,9 @@
 use RuntimeException;
 use Symfony\Bridge\Doctrine\DataFixtures\ContainerAwareLoader;
 use function array_key_exists;
+use function array_map;
+use function array_merge;
+use function array_reduce;
 use function array_values;
 use function get_class;
 use function sprintf;
diff --git a/Tests/Loader/ResolveFixturesSubtreeTest.php b/Tests/Loader/ResolveFixturesSubtreeTest.php
index 9b2a7a63..b322b5d7 100644
--- a/Tests/Loader/ResolveFixturesSubtreeTest.php
+++ b/Tests/Loader/ResolveFixturesSubtreeTest.php
@@ -12,6 +12,8 @@
 use Doctrine\Persistence\ObjectManager;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Container;
+use function interface_exists;
+use function class_alias;
 
 /**
  * @covers \Doctrine\Bundle\FixturesBundle\Loader\SymfonyFixturesLoader::getFixturesDependencyTree
@@ -19,16 +21,19 @@
  */
 class ResolveFixturesSubtreeTest extends TestCase
 {
+    /**
+     * @var SymfonyFixturesLoader
+     */
     private $loader;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass() : void
     {
-        if (!interface_exists(ObjectManager::class)) {
+        if (! interface_exists(ObjectManager::class)) {
             class_alias('Doctrine\Common\Persistence\ObjectManager', 'Doctrine\Persistence\ObjectManager', false);
         }
     }
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->loader = new SymfonyFixturesLoader(new Container());
     }
@@ -95,6 +100,9 @@ public function testResolveRecursively() : void
     private function createFixture(array $dependencies) : FixtureInterface
     {
         return new class ($dependencies) implements FixtureInterface, DependentFixtureInterface {
+            /**
+             * @var string[]
+             */
             private $dependencies;
 
             public function __construct(array $dependencies)
@@ -102,11 +110,11 @@ public function __construct(array $dependencies)
                 $this->dependencies = $dependencies;
             }
 
-            public function load(ObjectManager $manager)
+            public function load(ObjectManager $manager) : void
             {
             }
 
-            public function getDependencies()
+            public function getDependencies() : array
             {
                 return $this->dependencies;
             }