Merge pull request #1868 from eoneopay/remove-soft-deleted-objects-from-cache

[SoftDeleteable] Detach soft-deleted objects from entity manager after flush

Author: l3pp4rd

lib/Gedmo/SoftDeleteable/SoftDeleteableListener.php

@@ -29,6 +29,13 @@ class SoftDeleteableListener extends MappedEventSubscriber
      */
     const POST_SOFT_DELETE = "postSoftDelete";
 
+    /**
+     * Objects soft-deleted on flush.
+     *
+     * @var array
+     */
+    private $softDeletedObjects = array();
+
     /**
      * {@inheritdoc}
      */
@@ -37,6 +44,7 @@ public function getSubscribedEvents()
         return array(
             'loadClassMetadata',
             'onFlush',
+            'postFlush'
         );
     }
 
@@ -90,10 +98,32 @@ public function onFlush(EventArgs $args)
                     self::POST_SOFT_DELETE,
                     $ea->createLifecycleEventArgsInstance($object, $om)
                 );
+
+                $this->softDeletedObjects[] = $object;
             }
         }
     }
 
+    /**
+     * Detach soft-deleted objects from object manager.
+     *
+     * @param \Doctrine\Common\EventArgs $args
+     *
+     * @return void
+     *
+     * @throws \Gedmo\Exception\InvalidArgumentException
+     */
+    public function postFlush(EventArgs $args)
+    {
+        $ea = $this->getEventAdapter($args);
+        $om = $ea->getObjectManager();
+
+        foreach ($this->softDeletedObjects as $index => $object) {
+            $om->detach($object);
+            unset($this->softDeletedObjects[$index]);
+        }
+    }
+
     /**
      * Maps additional metadata
      *

tests/Gedmo/SoftDeleteable/SoftDeleteableEntityTest.php

@@ -76,6 +76,28 @@ public function shouldBeAbleToHardDeleteSoftdeletedItems()
         $this->assertNull($user);
     }
 
+    /**
+     * @test
+     */
+    public function shouldNotFetchSoftDeletedItemByIdIfDetachOnDeleteEnabled()
+    {
+        $repo = $this->em->getRepository(self::USER_CLASS);
+
+        $newUser = new User();
+        $newUser->setUsername('test_user');
+
+        $this->em->persist($newUser);
+        $this->em->flush();
+
+        $userId = $newUser->getId();
+
+        $this->em->remove($newUser);
+        $this->em->flush();
+
+        $user = $repo->find($userId);
+        $this->assertNull($user);
+    }
+
     /**
      * @test
      */
@@ -420,7 +442,7 @@ protected function getUsedEntityFixtures()
             self::OTHER_ARTICLE_CLASS,
             self::OTHER_COMMENT_CLASS,
             self::MAPPED_SUPERCLASS_CHILD_CLASS,
-            self::USER_NO_HARD_DELETE_CLASS,
+            self::USER_NO_HARD_DELETE_CLASS
         );
     }
 }