fire a trashed event on soft deleting and listen to it for model bro…

…adcasting (#37618)
dilianur · Jun 7, 2021 · 002595d · 002595d
1 parent 1e06ebe
commit 002595d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/Eloquent/BroadcastableModelEventOccurred.php b/Eloquent/BroadcastableModelEventOccurred.php
@@ -97,4 +97,14 @@ public function onChannels(array $channels)
 
         return $this;
     }
+
+    /**
+     * Get the event name.
+     *
+     * @return string
+     */
+    public function event()
+    {
+        return $this->event;
+    }
 }
diff --git a/Eloquent/BroadcastsEvents.php b/Eloquent/BroadcastsEvents.php
@@ -22,7 +22,7 @@ public static function bootBroadcastsEvents()
         });
 
         if (method_exists(static::class, 'bootSoftDeletes')) {
-            static::trashed(function ($model) {
+            static::softDeleted(function ($model) {
                 $model->broadcastTrashed();
             });
 

diff --git a/Eloquent/SoftDeletes.php b/Eloquent/SoftDeletes.php
@@ -96,6 +96,8 @@ protected function runSoftDelete()
         $query->update($columns);
 
         $this->syncOriginalAttributes(array_keys($columns));
+
+        $this->fireModelEvent('trashed', false);
     }
 
     /**
@@ -136,6 +138,17 @@ public function trashed()
         return ! is_null($this->{$this->getDeletedAtColumn()});
     }
 
+    /**
+     * Register a "softDeleted" model event callback with the dispatcher.
+     *
+     * @param  \Closure|string  $callback
+     * @return void
+     */
+    public static function softDeleted($callback)
+    {
+        static::registerModelEvent('trashed', $callback);
+    }
+
     /**
      * Register a "restoring" model event callback with the dispatcher.
      *