Replace deprecated function calls

mariusklocke · Jan 12, 2023 · a5cd37e · a5cd37e
1 parent fe92d46
commit a5cd37e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/Infrastructure/Persistence/ORM/DoctrineEmbeddableListener.php b/src/Infrastructure/Persistence/ORM/DoctrineEmbeddableListener.php
@@ -4,7 +4,7 @@
 namespace HexagonalPlayground\Infrastructure\Persistence\ORM;
 
 use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\Event\LifecycleEventArgs;
+use Doctrine\ORM\Event\PostLoadEventArgs;
 use Psr\Log\LoggerInterface;
 use ReflectionProperty;
 
@@ -31,9 +31,9 @@ public function __construct(EntityManager $entityManager, LoggerInterface $logge
         $this->logger = $logger;
     }
 
-    public function postLoad(LifecycleEventArgs $eventArgs)
+    public function postLoad(PostLoadEventArgs $eventArgs)
     {
-        $entity = $eventArgs->getEntity();
+        $entity = $eventArgs->getObject();
         $metadata = $this->entityManager->getClassMetadata(get_class($entity));
         $properties = array_keys($metadata->embeddedClasses);
         foreach ($properties as $property) {

diff --git a/src/Infrastructure/Persistence/ORM/DoctrineServiceProvider.php b/src/Infrastructure/Persistence/ORM/DoctrineServiceProvider.php
@@ -4,6 +4,7 @@
 namespace HexagonalPlayground\Infrastructure\Persistence\ORM;
 
 use DI;
+use Doctrine\Common\EventManager;
 use Doctrine\Common\Proxy\AbstractProxyFactory;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DriverManager;
@@ -49,12 +50,19 @@ public function getDefinitions(): array
     {
         return [
             EntityManagerInterface::class => DI\factory(function (ContainerInterface $container) {
-                $em = EntityManager::create($container->get(Connection::class), $container->get(Configuration::class));
-                $em->getEventManager()->addEventListener(
+                $eventManager  = new EventManager();
+                $entityManager = new EntityManager(
+                    $container->get(Connection::class),
+                    $container->get(Configuration::class),
+                    $eventManager
+                );
+
+                $eventManager->addEventListener(
                     [Events::postLoad],
-                    new DoctrineEmbeddableListener($em, $container->get(LoggerInterface::class))
+                    new DoctrineEmbeddableListener($entityManager, $container->get(LoggerInterface::class))
                 );
-                return $em;
+
+                return $entityManager;
             }),
 
             Connection::class => DI\factory(function (ContainerInterface $container) {