Remove detachOnDelete option and always detach soft-deleted object from entity manager.

Author: NatePage

lib/Gedmo/Mapping/Annotation/SoftDeleteable.php

@@ -23,7 +23,4 @@ final class SoftDeleteable extends Annotation
 
     /** @var bool */
     public $hardDelete = true;
-
-    /** @var bool */
-    public $detachOnDelete = false;
 }

lib/Gedmo/SoftDeleteable/Mapping/Driver/Annotation.php

@@ -52,14 +52,6 @@ public function readExtendedMetadata($meta, array &$config)
                 }
                 $config['hardDelete'] = $annot->hardDelete;
             }
-
-            $config['detachOnDelete'] = false;
-            if (isset($annot->detachOnDelete)) {
-                if (!is_bool($annot->detachOnDelete)) {
-                    throw new InvalidMappingException("detachOnDelete must be boolean. ".gettype($annot->detachOnDelete)." provided.");
-                }
-                $config['detachOnDelete'] = $annot->detachOnDelete;
-            }
         }
 
         $this->validateFullMetadata($meta, $config);

lib/Gedmo/SoftDeleteable/Mapping/Driver/Xml.php

@@ -53,11 +53,6 @@ public function readExtendedMetadata($meta, array &$config)
                 if ($this->_isAttributeSet($xml->{'soft-deleteable'}, 'hard-delete')) {
                     $config['hardDelete'] = $this->_getBooleanAttribute($xml->{'soft-deleteable'}, 'hard-delete');
                 }
-
-                $config['detachOnDelete'] = false;
-                if ($this->_isAttributeSet($xml->{'soft-deleteable'}, 'detach-on-delete')) {
-                    $config['detachOnDelete'] = $this->_getBooleanAttribute($xml->{'soft-deleteable'}, 'detach-on-delete');
-                }
             }
         }
     }

lib/Gedmo/SoftDeleteable/Mapping/Driver/Yaml.php

@@ -62,14 +62,6 @@ public function readExtendedMetadata($meta, array &$config)
                     }
                     $config['hardDelete'] = $classMapping['soft_deleteable']['hard_delete'];
                 }
-
-                $config['detachOnDelete'] = false;
-                if (isset($classMapping['soft_deleteable']['detach_on_delete'])) {
-                    if (!is_bool($classMapping['soft_deleteable']['detach_on_delete'])) {
-                        throw new InvalidMappingException("detachOnDelete must be boolean. ".gettype($classMapping['soft_deleteable']['detach_on_delete'])." provided.");
-                    }
-                    $config['detachOnDelete'] = $classMapping['soft_deleteable']['detach_on_delete'];
-                }
             }
         }
     }

lib/Gedmo/SoftDeleteable/SoftDeleteableListener.php

@@ -99,9 +99,7 @@ public function onFlush(EventArgs $args)
                     $ea->createLifecycleEventArgsInstance($object, $om)
                 );
 
-                if (isset($config['detachOnDelete']) && $config['detachOnDelete']) {
-                    $this->softDeletedObjects[] = $object;
-                }
+                $this->softDeletedObjects[] = $object;
             }
         }
     }
@@ -112,20 +110,16 @@ public function onFlush(EventArgs $args)
      * @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) {
-            $meta = $om->getClassMetadata(get_class($object));
-            $config = $this->getConfiguration($om, $meta->name);
-
-            if (isset($config['detachOnDelete']) && $config['detachOnDelete']) {
-                $om->detach($object);
-            }
-
+            $om->detach($object);
             unset($this->softDeletedObjects[$index]);
         }
     }

tests/Gedmo/SoftDeleteable/Fixture/Entity/UserDetachOnDelete.php

@@ -2,7 +2,6 @@
 
 namespace Gedmo\SoftDeleteable;
 
-use SoftDeleteable\Fixture\Entity\UserDetachOnDelete;
 use SoftDeleteable\Fixture\Entity\UserNoHardDelete;
 use Tool\BaseTestCaseORM;
 use Doctrine\Common\EventManager;
@@ -38,7 +37,6 @@ class SoftDeleteableEntityTest extends BaseTestCaseORM
     const MAPPED_SUPERCLASS_CHILD_CLASS = 'SoftDeleteable\Fixture\Entity\Child';
     const SOFT_DELETEABLE_FILTER_NAME = 'soft-deleteable';
     const USER_NO_HARD_DELETE_CLASS = 'SoftDeleteable\Fixture\Entity\UserNoHardDelete';
-    const USER_DETACH_ON_DELETE = 'SoftDeleteable\Fixture\Entity\UserDetachOnDelete';
 
     private $softDeleteableListener;
 
@@ -81,39 +79,12 @@ public function shouldBeAbleToHardDeleteSoftdeletedItems()
     /**
      * @test
      */
-    public function shouldNeedToClearEntityManagerNotToFetchSoftDeletedItemById()
+    public function shouldNotFetchSoftDeletedItemByIdIfDetachOnDeleteEnabled()
     {
         $repo = $this->em->getRepository(self::USER_CLASS);
 
         $newUser = new User();
-        $newUser->setUsername($username = 'test_user');
-
-        $this->em->persist($newUser);
-        $this->em->flush();
-
-        $userId = $newUser->getId();
-
-        $this->em->remove($newUser);
-        $this->em->flush();
-
-        $user = $repo->find($userId);
-        $this->assertInstanceOf(self::USER_CLASS, $user);
-
-        $this->em->clear();
-
-        $user = $repo->find($userId);
-        $this->assertNull($user);
-    }
-
-    /**
-     * @test
-     */
-    public function shouldNotFetchSoftDeletedItemByIdIfDetachOnDeleteEnabled()
-    {
-        $repo = $this->em->getRepository(self::USER_DETACH_ON_DELETE);
-
-        $newUser = new UserDetachOnDelete();
-        $newUser->setUsername($username = 'test_user');
+        $newUser->setUsername('test_user');
 
         $this->em->persist($newUser);
         $this->em->flush();
@@ -471,8 +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_DETACH_ON_DELETE
+            self::USER_NO_HARD_DELETE_CLASS
         );
     }
 }