matteosavio · December 26, 2018 13:25 · Dec 26, 2018 · Feb 19, 2015
diff --git a/DeletedFilter.php b/DeletedFilter.php
@@ -1,19 +1,17 @@
 <?php
-namespace Namespace\MyBundle\Repository\Filters;
+    namespace App\Repository\Filters;
+
+    use Doctrine\ORM\Mapping\ClassMetaData;
+    use Doctrine\ORM\Query\Filter\SQLFilter;
 
-use Doctrine\ORM\Mapping\ClassMetaData;
-use Doctrine\ORM\Query\Filter\SQLFilter;
-
-class DeletedFilter extends SQLFilter
-{
-    public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias)
+    class DeletedFilter extends SQLFilter
     {
-        if ($targetEntity->hasField("deletedAt")) {
-            $date = date("Y-m-d h:m:s");
-
-            return $targetTableAlias.".deletedAt < '".$date."' OR ".$targetTableAlias.".deletedAt IS NULL";
+        public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias)
+        {
+            if ($targetEntity->hasField("deletedOn")) {
+                $date = date("Y-m-d h:m:s");
+                return $targetTableAlias." . deleted_on < '" . $date . "' OR " . $targetTableAlias.".deleted_on IS NULL";
+            }
+            return "";
         }
-
-        return "";
-    }
-}
+    }
diff --git a/DoctrineListener.php b/DoctrineListener.php
@@ -1,21 +1,19 @@
 <?php
-namespace Namespace\MyBundle\Listener;
+namespace App\EventListener;
 
 use Doctrine\ORM\Event\PreFlushEventArgs;
 
 class DoctrineListener
 {
     public function preFlush(PreFlushEventArgs $event) {
         $em = $event->getEntityManager();
-
         foreach ($em->getUnitOfWork()->getScheduledEntityDeletions() as $object) {
-            if (method_exists($object, "getDeletedAt")) {
-                if ($object->getDeletedAt() instanceof \Datetime) {
+            if (method_exists($object, "getDeletedOn")) {
+                if ($object->getDeletedOn() instanceof \Datetime) {
                     continue;
                 } else {
-                    $object->setDeletedAt(new \DateTime());
+                    $object->setDeletedOn(new \DateTime());
                     $em->merge($object);
-
                     $em->persist($object);
                 }
             }

diff --git a/Entity.php b/Entity.php
@@ -1,37 +1,25 @@
 <?php
-namespace Namespace\MyBundle\Entity;
+
+namespace App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
-class Entity
+class Base
 {
     /**
-     * @var datetime $deletedAt
-     *
-     * @ORM\Column(name="deletedAt", type="datetime", nullable=true)
+     * @ORM\Column(type="datetime", nullable=true)
      */
-    private $deletedAt;
+    private $deletedOn;
 
-    /**
-     * Set deletedAt
-     *
-     * @param  \DateTime $deletedAt
-     * @return Plan
-     */
-    public function setDeletedAt($deletedAt)
+    public function getDeletedOn(): ?\DateTimeInterface
     {
-        $this->deletedAt = $deletedAt;
-
-        return $this;
+        return $this->deletedOn;
     }
 
-    /**
-     * Get deletedAt
-     *
-     * @return \DateTime
-     */
-    public function getDeletedAt()
+    public function setDeletedOn(?\DateTimeInterface $deletedOn): self
     {
-        return $this->deletedAt;
+        $this->deletedOn = $deletedOn;
+
+        return $this;
     }
 }
diff --git a/config.yml b/config.yml
@@ -1,7 +1,8 @@
-# app/config/config.yml
+# config/packages/doctrine.yaml
 doctrine:
     orm:
         filters:
             deleted:
-                class: 'Namespace\MyBundle\Repository\Filters\DeletedFilter'
-                enabled: true
+                class: 'App\Repository\Filters\DeletedFilter'
+                enabled: true
+
diff --git a/services.yaml b/services.yaml
@@ -0,0 +1,5 @@
+# config/services.yml
+    App\EventListener\DoctrineListener:
+        public: false
+        tags:
+            - { name: doctrine.event_listener, event: preFlush, method: preFlush }
diff --git a/services.yml b/services.yml
@@ -1,7 +0,0 @@
-# src/namespace/mybundle/Resources/config/services.yml
-services:
-    kernel.listener.doctrine:
-        class: Namespace\MyBundle\Listener\DoctrineListener
-        public: false
-        tags:
-            - { name: doctrine.event_listener, event: preFlush, method: preFlush }

diff --git a/DeletedFilter.php b/DeletedFilter.php
@@ -0,0 +1,19 @@
+<?php
+namespace Namespace\MyBundle\Repository\Filters;
+
+use Doctrine\ORM\Mapping\ClassMetaData;
+use Doctrine\ORM\Query\Filter\SQLFilter;
+
+class DeletedFilter extends SQLFilter
+{
+    public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias)
+    {
+        if ($targetEntity->hasField("deletedAt")) {
+            $date = date("Y-m-d h:m:s");
+
+            return $targetTableAlias.".deletedAt < '".$date."' OR ".$targetTableAlias.".deletedAt IS NULL";
+        }
+
+        return "";
+    }
+}
diff --git a/DoctrineListener.php b/DoctrineListener.php
@@ -0,0 +1,24 @@
+<?php
+namespace Namespace\MyBundle\Listener;
+
+use Doctrine\ORM\Event\PreFlushEventArgs;
+
+class DoctrineListener
+{
+    public function preFlush(PreFlushEventArgs $event) {
+        $em = $event->getEntityManager();
+
+        foreach ($em->getUnitOfWork()->getScheduledEntityDeletions() as $object) {
+            if (method_exists($object, "getDeletedAt")) {
+                if ($object->getDeletedAt() instanceof \Datetime) {
+                    continue;
+                } else {
+                    $object->setDeletedAt(new \DateTime());
+                    $em->merge($object);
+
+                    $em->persist($object);
+                }
+            }
+        }
+    }
+}
diff --git a/Entity.php b/Entity.php
@@ -0,0 +1,37 @@
+<?php
+namespace Namespace\MyBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+class Entity
+{
+    /**
+     * @var datetime $deletedAt
+     *
+     * @ORM\Column(name="deletedAt", type="datetime", nullable=true)
+     */
+    private $deletedAt;
+
+    /**
+     * Set deletedAt
+     *
+     * @param  \DateTime $deletedAt
+     * @return Plan
+     */
+    public function setDeletedAt($deletedAt)
+    {
+        $this->deletedAt = $deletedAt;
+
+        return $this;
+    }
+
+    /**
+     * Get deletedAt
+     *
+     * @return \DateTime
+     */
+    public function getDeletedAt()
+    {
+        return $this->deletedAt;
+    }
+}
diff --git a/config.yml b/config.yml
@@ -0,0 +1,7 @@
+# app/config/config.yml
+doctrine:
+    orm:
+        filters:
+            deleted:
+                class: 'Namespace\MyBundle\Repository\Filters\DeletedFilter'
+                enabled: true
diff --git a/services.yml b/services.yml
@@ -0,0 +1,7 @@
+# src/namespace/mybundle/Resources/config/services.yml
+services:
+    kernel.listener.doctrine:
+        class: Namespace\MyBundle\Listener\DoctrineListener
+        public: false
+        tags:
+            - { name: doctrine.event_listener, event: preFlush, method: preFlush }