Merge pull request #20 from opensoft/fix-remove

Ensure objects that are proxies are properly initialized before

Author: richardfullmer

src/EventListener/StorageListener.php

@@ -5,6 +5,7 @@
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PostFlushEventArgs;
+use Doctrine\ORM\Proxy\Proxy;
 use League\Flysystem\FileNotFoundException;
 use Opensoft\StorageBundle\Entity\StorageFile;
 use Opensoft\StorageBundle\Storage\StorageManagerInterface;
@@ -42,6 +43,23 @@ public function __construct(StorageManagerInterface $storageManager, LoggerInter
         $this->logger = $logger;
     }
 
+    /**
+     * Ensure removed entities have been properly proxy loaded so that deleteEntityFromStorage works
+     *
+     * @param LifecycleEventArgs $eventArgs
+     */
+    public function preRemove(LifecycleEventArgs $eventArgs): void
+    {
+        $entity = $eventArgs->getEntity();
+        if ($entity instanceof StorageFile) {
+            // doctrine <= 3 (doctrine switches to ocramius/proxy-manager in version 3)
+            if ($entity instanceof Proxy) {
+                // manually trigger a proxy load by asking for one of the class members
+                $entity->getStorage();
+            }
+        }
+    }
+
     /**
      * Remove is called after each DELETE statement inside the transaction is sent to the DB
      *
@@ -111,8 +129,9 @@ private function deleteEntityFromStorage(StorageFile $file): void
     public function getSubscribedEvents(): array
     {
         return [
-            'postFlush',
-            'postRemove'
+            'preRemove',
+            'postRemove',
+            'postFlush'
         ];
     }
 }