Fix parent class events applying to child classes

Author: CImrie

src/EventRedirector.php

@@ -4,6 +4,7 @@
 namespace RandomState\LaravelDoctrineEntityEvents;
 
 
+use App\Identity\Entities\Organisation;
 use Closure;
 use Doctrine\Common\EventSubscriber;
 
@@ -37,7 +38,7 @@ public function __call($event, array $arguments)
         }
 
         $entity = $eventArgs->getObject();
-        $redirects = $this->redirects[get_class($entity)] ?? false;
+        $redirects = $this->getRedirectsForClass(get_class($entity)); //$this->redirects[get_class($entity)] ?? false;
 
         if($redirects) {
             foreach($redirects as $redirect) {
@@ -47,6 +48,19 @@ public function __call($event, array $arguments)
         }
     }
 
+    public function getRedirectsForClass($class)
+    {
+        $redirects = $this->redirects[$class] ?? [];
+
+        $parent = get_parent_class($class);
+
+        if(!$parent) {
+            return $redirects;
+        }
+
+        return array_merge($redirects, $this->getRedirectsForClass($parent));
+    }
+
     /**
      * @param $entityClass
      * @param Redirect $redirect

src/LaravelDoctrineEntityEventsServiceProvider.php

@@ -14,16 +14,16 @@ class LaravelDoctrineEntityEventsServiceProvider extends ServiceProvider
     public function register()
     {
         $this->app->resolving(EventRedirector::class, function(EventRedirector $redirector) {
-           if($onBoot = EventRedirector::$onBoot) {
-               $onBoot($redirector);
-           }
+            if($onBoot = EventRedirector::$onBoot) {
+                $onBoot($redirector);
+            }
 
-           return $redirector;
+            return $redirector;
         });
 
         $this->app->resolving(EntityManagerInterface::class, function(EntityManagerInterface $entityManager) {
-           $entityManager->getEventManager()->addEventSubscriber($this->app->make(EventRedirector::class));
-           return $entityManager;
+            $entityManager->getEventManager()->addEventSubscriber($this->app->make(EventRedirector::class));
+            return $entityManager;
         });
     }
 }

tests/Feature/TriggerLaravelEventTest.php

@@ -5,7 +5,6 @@
 
 
 use Doctrine\Common\EventManager;
-use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Illuminate\Support\Facades\Event;