Merge pull request #376 from Evgenii-Gordeev-optimax/extend-fixture-event-with-object-manager

PostFixtureSetupEvent with ObjectManager dependency

Author: alexisLefebvre

src/Event/FixtureEvent.php

@@ -15,6 +15,6 @@
 
 use Symfony\Contracts\EventDispatcher\Event;
 
-class FixtureEvent extends Event
+abstract class FixtureEvent extends Event
 {
 }

src/Event/PostFixtureSetupEvent.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Liip/TestFixturesBundle
+ *
+ * (c) Lukas Kahwe Smith <smith@pooteeweet.org>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Liip\TestFixturesBundle\Event;
+
+use Doctrine\Persistence\ObjectManager;
+
+class PostFixtureSetupEvent extends FixtureEvent
+{
+    private ObjectManager $manager;
+
+    public function __construct(
+        ObjectManager $manager,
+    ) {
+        $this->manager = $manager;
+    }
+
+    public function getManager(): ObjectManager
+    {
+        return $this->manager;
+    }
+}

src/LiipTestFixturesEvents.php

@@ -13,8 +13,8 @@
 
 namespace Liip\TestFixturesBundle;
 
-use Liip\TestFixturesBundle\Event\FixtureEvent;
 use Liip\TestFixturesBundle\Event\PostFixtureBackupRestoreEvent;
+use Liip\TestFixturesBundle\Event\PostFixtureSetupEvent;
 use Liip\TestFixturesBundle\Event\PreFixtureBackupRestoreEvent;
 use Liip\TestFixturesBundle\Event\ReferenceSaveEvent;
 
@@ -23,7 +23,7 @@ final class LiipTestFixturesEvents
     /** @see PreFixtureBackupRestoreEvent */
     public const PRE_FIXTURE_BACKUP_RESTORE = 'liip_test_fixtures.pre_fixture_backup_restore';
 
-    /** @see FixtureEvent */
+    /** @see PostFixtureSetupEvent */
     public const POST_FIXTURE_SETUP = 'liip_test_fixtures.post_fixture_setup';
 
     /** @see PostFixtureBackupRestoreEvent */

src/Services/DatabaseTools/ORMDatabaseTool.php

@@ -22,8 +22,8 @@
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\SchemaTool;
-use Liip\TestFixturesBundle\Event\FixtureEvent;
 use Liip\TestFixturesBundle\Event\PostFixtureBackupRestoreEvent;
+use Liip\TestFixturesBundle\Event\PostFixtureSetupEvent;
 use Liip\TestFixturesBundle\Event\PreFixtureBackupRestoreEvent;
 use Liip\TestFixturesBundle\Event\ReferenceSaveEvent;
 use Liip\TestFixturesBundle\LiipTestFixturesEvents;
@@ -122,7 +122,7 @@ public function loadFixtures(array $classNames = [], bool $append = false): Abst
             }
         }
 
-        $event = new FixtureEvent();
+        $event = new PostFixtureSetupEvent($this->om);
         $this->eventDispatcher->dispatch($event, LiipTestFixturesEvents::POST_FIXTURE_SETUP);
 
         $executor = $this->getExecutor($this->getPurger());

src/Services/DatabaseTools/ORMSqliteDatabaseTool.php

@@ -18,8 +18,8 @@
 use Doctrine\DBAL\Platforms\SQLitePlatform;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\Tools\SchemaTool;
-use Liip\TestFixturesBundle\Event\FixtureEvent;
 use Liip\TestFixturesBundle\Event\PostFixtureBackupRestoreEvent;
+use Liip\TestFixturesBundle\Event\PostFixtureSetupEvent;
 use Liip\TestFixturesBundle\Event\PreFixtureBackupRestoreEvent;
 use Liip\TestFixturesBundle\Event\ReferenceSaveEvent;
 use Liip\TestFixturesBundle\LiipTestFixturesEvents;
@@ -90,7 +90,7 @@ public function loadFixtures(array $classNames = [], bool $append = false): Abst
             }
         }
 
-        $event = new FixtureEvent();
+        $event = new PostFixtureSetupEvent($this->om);
         $this->eventDispatcher->dispatch($event, LiipTestFixturesEvents::POST_FIXTURE_SETUP);
 
         $executor = $this->getExecutor($this->getPurger());

tests/AppConfigEvents/EventListener/FixturesSubscriber.php

@@ -13,8 +13,8 @@
 
 namespace Liip\Acme\Tests\AppConfigEvents\EventListener;
 
-use Liip\TestFixturesBundle\Event\FixtureEvent;
 use Liip\TestFixturesBundle\Event\PostFixtureBackupRestoreEvent;
+use Liip\TestFixturesBundle\Event\PostFixtureSetupEvent;
 use Liip\TestFixturesBundle\Event\PreFixtureBackupRestoreEvent;
 use Liip\TestFixturesBundle\Event\ReferenceSaveEvent;
 use Liip\TestFixturesBundle\LiipTestFixturesEvents;
@@ -42,9 +42,10 @@ public function preFixtureBackupRestore(PreFixtureBackupRestoreEvent $preFixture
         // your code
     }
 
-    public function postFixtureSetup(FixtureEvent $fixture): void
+    public function postFixtureSetup(PostFixtureSetupEvent $postFixtureSetupEvent): void
     {
-        // There are no parameters
+        $manager = $postFixtureSetupEvent->getManager();
+
         // your code
     }