Dynamically fix compatibility with doctrine/data-fixtures v2

Classes that extend ContainerAwareLoader have to also extend Loader, meaning
this is no breaking change because it can be argued that the incompatibility of
the extending class would be with the Loader interface.

Author: greg0ire

composer.json

@@ -127,7 +127,7 @@
         "doctrine/annotations": "^1.13.1|^2",
         "doctrine/cache": "^1.11|^2.0",
         "doctrine/collections": "^1.0|^2.0",
-        "doctrine/data-fixtures": "^1.1",
+        "doctrine/data-fixtures": "^1.1|^2",
         "doctrine/dbal": "^2.13.1|^3.0",
         "doctrine/orm": "^2.7.4",
         "guzzlehttp/promises": "^1.4|^2.0",

src/Symfony/Bridge/Doctrine/DataFixtures/AddFixtureImplementation.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\DataFixtures;
+
+use Doctrine\Common\DataFixtures\FixtureInterface;
+use Doctrine\Common\DataFixtures\ReferenceRepository;
+
+if (method_exists(ReferenceRepository::class, 'getReferences')) {
+    /** @internal */
+    trait AddFixtureImplementation
+    {
+        public function addFixture(FixtureInterface $fixture)
+        {
+            $this->doAddFixture($fixture);
+        }
+    }
+} else {
+    /** @internal */
+    trait AddFixtureImplementation
+    {
+        public function addFixture(FixtureInterface $fixture): void
+        {
+            $this->doAddFixture($fixture);
+        }
+    }
+}

src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php

@@ -25,17 +25,16 @@
  */
 class ContainerAwareLoader extends Loader
 {
+    use AddFixtureImplementation;
+
     private $container;
 
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function addFixture(FixtureInterface $fixture)
+    private function doAddFixture(FixtureInterface $fixture): void
     {
         if ($fixture instanceof ContainerAwareInterface) {
             $fixture->setContainer($this->container);

src/Symfony/Bridge/Doctrine/composer.json

@@ -45,7 +45,7 @@
         "symfony/var-dumper": "^4.4|^5.0|^6.0",
         "doctrine/annotations": "^1.10.4|^2",
         "doctrine/collections": "^1.0|^2.0",
-        "doctrine/data-fixtures": "^1.1",
+        "doctrine/data-fixtures": "^1.1|^2",
         "doctrine/dbal": "^2.13.1|^3|^4",
         "doctrine/orm": "^2.7.4|^3",
         "psr/log": "^1|^2|^3"