tinker1987 · September 1, 2017 14:00 · Sep 1, 2017 · Sep 1, 2017 · Aug 30, 2017 · Aug 25, 2017
diff --git a/FixtureAwareTestCaseTrait.php b/FixtureAwareTestCaseTrait.php
@@ -3,10 +3,9 @@
 
 namespace Tests;
 
-use Doctrine\Common\DataFixtures\Executor\ORMExecutor;
-use Doctrine\Common\DataFixtures\FixtureInterface;
-use Doctrine\Common\DataFixtures\Purger\ORMPurger;
-use Doctrine\Common\DataFixtures\SharedFixtureInterface;
+use Doctrine\Common\DataFixtures\{
+    Executor\ORMExecutor, FixtureInterface, Purger\ORMPurger, SharedFixtureInterface
+};
 use Doctrine\Common\Persistence\ObjectManager;
 use Symfony\Bridge\Doctrine\DataFixtures\ContainerAwareLoader;
 
@@ -28,7 +27,6 @@ trait FixtureAwareTestCaseTrait
     private $fixtureLoader;
 
     /**
-     * Adds a new fixture to be loaded.
      * @param FixtureInterface $fixture
      * @return self
      */
@@ -40,10 +38,11 @@ protected function addFixture(FixtureInterface $fixture)
 
     /**
      * Executes all the fixtures that have been loaded so far.
+     * @param bool $append
      */
-    protected function executeFixtures()
+    protected function executeFixtures(bool $append = false)
     {
-        $this->getFixtureExecutor()->execute($this->getFixtureLoader()->getFixtures());
+        $this->getFixtureExecutor()->execute($this->getFixtureLoader()->getFixtures(), $append);
     }
 
     /**

diff --git a/FixtureAwareTestCaseTrait.php b/FixtureAwareTestCaseTrait.php
@@ -46,6 +46,14 @@ protected function executeFixtures()
         $this->getFixtureExecutor()->execute($this->getFixtureLoader()->getFixtures());
     }
 
+    /**
+     * Purges loaded fixtures from DB
+     */
+    protected function purgeFixtures()
+    {
+        $this->getFixtureExecutor()->getPurger()->purge();
+    }
+
     /**
      * @return ORMExecutor
      */

diff --git a/FixtureAwareTestCaseTrait.php b/FixtureAwareTestCaseTrait.php
@@ -6,6 +6,8 @@
 use Doctrine\Common\DataFixtures\Executor\ORMExecutor;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\DataFixtures\Purger\ORMPurger;
+use Doctrine\Common\DataFixtures\SharedFixtureInterface;
+use Doctrine\Common\Persistence\ObjectManager;
 use Symfony\Bridge\Doctrine\DataFixtures\ContainerAwareLoader;
 
 /**
@@ -54,7 +56,21 @@ private function getFixtureExecutor()
              * @var \Doctrine\ORM\EntityManager $entityManager
              */
             $entityManager = self::$kernel->getContainer()->get('doctrine')->getManager();
-            $this->fixtureExecutor = new ORMExecutor($entityManager, new ORMPurger($entityManager));
+            $this->fixtureExecutor = new class ($entityManager, new ORMPurger($entityManager)) extends ORMExecutor
+            {
+                /**
+                 * @inheritDoc
+                 */
+                public function load(ObjectManager $manager, FixtureInterface $fixture)
+                {
+                    if ($fixture instanceof SharedFixtureInterface) {
+                        $fixture->setReferenceRepository($this->referenceRepository);
+                    }
+
+                    $fixture->load($manager);
+                }
+
+            };
         }
         return $this->fixtureExecutor;
     }

diff --git a/FixtureAwareTestCaseTrait.php b/FixtureAwareTestCaseTrait.php
@@ -27,12 +27,13 @@ trait FixtureAwareTestCaseTrait
 
     /**
      * Adds a new fixture to be loaded.
-     *
      * @param FixtureInterface $fixture
+     * @return self
      */
     protected function addFixture(FixtureInterface $fixture)
     {
         $this->getFixtureLoader()->addFixture($fixture);
+        return $this;
     }
 
     /**

diff --git a/FixtureAwareTestCaseTrait.php b/FixtureAwareTestCaseTrait.php
@@ -0,0 +1,71 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests;
+
+use Doctrine\Common\DataFixtures\Executor\ORMExecutor;
+use Doctrine\Common\DataFixtures\FixtureInterface;
+use Doctrine\Common\DataFixtures\Purger\ORMPurger;
+use Symfony\Bridge\Doctrine\DataFixtures\ContainerAwareLoader;
+
+/**
+ * Class FixtureAwareTestCaseTrait
+ * @package Tests
+ * @author Dmytro Paiareli <[email protected]>
+ */
+trait FixtureAwareTestCaseTrait
+{
+    /**
+     * @var ORMExecutor
+     */
+    private $fixtureExecutor;
+
+    /**
+     * @var ContainerAwareLoader
+     */
+    private $fixtureLoader;
+
+    /**
+     * Adds a new fixture to be loaded.
+     *
+     * @param FixtureInterface $fixture
+     */
+    protected function addFixture(FixtureInterface $fixture)
+    {
+        $this->getFixtureLoader()->addFixture($fixture);
+    }
+
+    /**
+     * Executes all the fixtures that have been loaded so far.
+     */
+    protected function executeFixtures()
+    {
+        $this->getFixtureExecutor()->execute($this->getFixtureLoader()->getFixtures());
+    }
+
+    /**
+     * @return ORMExecutor
+     */
+    private function getFixtureExecutor()
+    {
+        if (!$this->fixtureExecutor) {
+            /**
+             * @var \Doctrine\ORM\EntityManager $entityManager
+             */
+            $entityManager = self::$kernel->getContainer()->get('doctrine')->getManager();
+            $this->fixtureExecutor = new ORMExecutor($entityManager, new ORMPurger($entityManager));
+        }
+        return $this->fixtureExecutor;
+    }
+
+    /**
+     * @return ContainerAwareLoader
+     */
+    private function getFixtureLoader()
+    {
+        if (!$this->fixtureLoader) {
+            $this->fixtureLoader = new ContainerAwareLoader(self::$kernel->getContainer());
+        }
+        return $this->fixtureLoader;
+    }
+}