Merge pull request #3 from sanya-misharin/feature/support-symfony-6

Remove laravel collections lib and add symfony 6 version to composer

Author: CvekCoding

composer.json

@@ -12,14 +12,13 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "symfony/config": "^4.0|^5.0",
-        "symfony/dependency-injection": "^4.0|^5.0",
-        "symfony/http-kernel": "^4.0|^5.0",
-        "symfony/event-dispatcher": "^4.0|^5.0",
-        "symfony/doctrine-bridge": "^4.0|^5.0",
+        "symfony/config": "^4.0|^5.0|^6.0",
+        "symfony/dependency-injection": "^4.0|^5.0|^6.0",
+        "symfony/http-kernel": "^4.0|^5.0|^6.0",
+        "symfony/event-dispatcher": "^4.0|^5.0|^6.0",
+        "symfony/doctrine-bridge": "^4.0|^5.0|^6.0",
         "doctrine/orm": "^2.0",
-        "cvek/collection": "^2.0",
-        "symfony/messenger": "^4.0|^5.0"
+        "symfony/messenger": "^4.0|^5.0|^6.0"
     },
     "require-dev": {
         "roave/security-advisories": "dev-master"

src/EventDispatch/Listener/DomainEventsSubscriber.php

@@ -25,7 +25,6 @@
 use Doctrine\ORM\Events;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
-use Tightenco\Collect\Support\Collection;
 
 final class DomainEventsSubscriber implements EventSubscriber
 {
@@ -61,13 +60,18 @@ public function preFlush(PreFlushEventArgs $eventArgs): void
         if ($this->preFlushAlreadyInvoked) {
             return;
         }
+
         $this->preFlushAlreadyInvoked = true;
+        $events = [];
 
-        $this->fillEntities($eventArgs)
-            ->flatMap(static function (RaiseEventsInterface $entity) {
-                return $entity->popEvents();
-            })
-            ->each(function (DomainEventInterface $event) {
+        foreach ($this->fillEntities($eventArgs) as $entity) {
+            if ($entity instanceof RaiseEventsInterface) {
+                $events = array_merge($events, $entity->popEvents());
+            }
+        }
+
+        foreach ($events as $event) {
+            if ($event instanceof DomainEventInterface) {
                 if (!$event instanceof AbstractSyncDomainEvent) {
                     return;
                 }
@@ -77,8 +81,8 @@ public function preFlush(PreFlushEventArgs $eventArgs): void
                     : \get_class($event);
 
                 $this->eventDispatcher->dispatch($event->setLifecycleEvent(Events::preFlush), $eventName);
-            })
-        ;
+            }
+        }
 
         $this->preFlushAlreadyInvoked = false;
     }
@@ -88,26 +92,35 @@ public function onFlush(OnFlushEventArgs $eventArgs): void
         if ($this->onFlushAlreadyInvoked) {
             return;
         }
+
         $this->onFlushAlreadyInvoked = true;
+        $events = [];
+
+        foreach ($this->fillEntities($eventArgs) as $entity) {
+            if ($entity instanceof RaiseEventsInterface) {
+                $events = array_merge($events, $entity->popEvents());
+            }
+        }
 
-        $this->fillEntities($eventArgs)
-            ->flatMap(static function (RaiseEventsInterface $entity) {
-                return $entity->popEvents();
-            })
-            ->each(function (DomainEventInterface $event) {
+        foreach ($events as $event) {
+            if ($event instanceof DomainEventInterface) {
                 $eventName = $event instanceof CustomDomainEventInterface
                     ? $event->getEventName()
                     : \get_class($event);
 
                 if ($event instanceof AbstractAsyncDomainEvent) {
                     $this->bus->dispatch($event->setLifecycleEvent(Events::onFlush));
-                } else if ($event instanceof AbstractSyncDomainEvent) {
-                    $this->eventDispatcher->dispatch($event->setLifecycleEvent(Events::onFlush) , $eventName);
-                } else if (!$event->isAlreadyDispatched()) {
-                    $this->bus->dispatch($event->setDispatched());
+                } else {
+                    if ($event instanceof AbstractSyncDomainEvent) {
+                        $this->eventDispatcher->dispatch($event->setLifecycleEvent(Events::onFlush), $eventName);
+                    } else {
+                        if (!$event->isAlreadyDispatched()) {
+                            $this->bus->dispatch($event->setDispatched());
+                        }
+                    }
                 }
-            })
-        ;
+            }
+        }
 
         $this->onFlushAlreadyInvoked = false;
     }
@@ -117,22 +130,27 @@ public function postFlush(PostFlushEventArgs $eventArgs): void
         if ($this->postFlushAlreadyInvoked) {
             return;
         }
+
         $this->postFlushAlreadyInvoked = true;
+        $events = [];
 
-        $this->fillEntities($eventArgs)
-            ->flatMap(static function (RaiseEventsInterface $entity) {
-                return $entity->popEvents();
-            })
-            ->each(function (DomainEventInterface $event) {
+        foreach ($this->fillEntities($eventArgs) as $entity) {
+            if ($entity instanceof RaiseEventsInterface) {
+                $events = array_merge($events, $entity->popEvents());
+            }
+        }
+
+        foreach ($events as $event) {
+            if ($event instanceof DomainEventInterface) {
                 $eventName = $event instanceof CustomDomainEventInterface
                     ? $event->getEventName()
                     : \get_class($event);
 
                 if ($event instanceof AbstractSyncDomainEvent) {
                     $this->eventDispatcher->dispatch($event->setLifecycleEvent(Events::postFlush), $eventName);
                 }
-            })
-        ;
+            }
+        }
 
         $this->postFlushAlreadyInvoked = false;
     }
@@ -142,23 +160,31 @@ public function postFlush(PostFlushEventArgs $eventArgs): void
      *
      * @return RaiseEventsInterface[]
      */
-    private function fillEntities(EventArgs $eventArgs): Collection
+    private function fillEntities(EventArgs $eventArgs): array
     {
-        $domainEventsEntities = new Collection();
-        foreach ($eventArgs->getEntityManager()->getUnitOfWork()->getIdentityMap() as $class => $entities) {
+        $domainEventsEntities = [];
+        foreach (
+            $eventArgs->getEntityManager()
+                ->getUnitOfWork()
+                ->getIdentityMap() as $class => $entities
+        ) {
             if (!\in_array(RaiseEventsInterface::class, \class_implements($class), true)) {
                 continue;
             }
 
-            $domainEventsEntities = $domainEventsEntities->merge($entities);
+            $domainEventsEntities = array_merge($domainEventsEntities, $entities);
         }
 
-        foreach ($eventArgs->getEntityManager()->getUnitOfWork()->getScheduledEntityDeletions() as $entityToDelete) {
+        foreach (
+            $eventArgs->getEntityManager()
+                ->getUnitOfWork()
+                ->getScheduledEntityDeletions() as $entityToDelete
+        ) {
             if (!$entityToDelete instanceof RaiseEventsInterface) {
                 continue;
             }
 
-            $domainEventsEntities->add($entityToDelete);
+            $domainEventsEntities[] = $entityToDelete;
         }
 
         return $domainEventsEntities;