Replaces deleteChild method with fireRevisionableEvent()

spira · Sep 7, 2015 · a4537e5 · a4537e5
1 parent a2f7d8f
commit a4537e5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/api/app/Http/Controllers/ChildEntityController.php b/api/app/Http/Controllers/ChildEntityController.php
@@ -224,7 +224,8 @@ public function deleteOne($id, $childId)
         $model = $this->findParentEntity($id);
         $childModel = $this->findOrFailChildEntity($childId, $model);
 
-        $model->deleteChild($childModel, $this->relationName);
+        $childModel->delete();
+        $model->fireRevisionableEvent('deleteChild', [$childModel, $this->relationName]);
 
         return $this->getResponse()->noContent();
     }

diff --git a/api/composer.lock b/api/composer.lock
diff --git a/api/src/Model/Model/BaseModel.php b/api/src/Model/Model/BaseModel.php
@@ -337,16 +337,20 @@ public function save(array $options = [])
     }
 
     /**
-     * Delete child model from the database.
+     * Fires an event for RevisionableTrait.
      *
-     * @param  Model  $model
-     * @param  string $relation
+     * @param  string $event
+     * @param  array  $payload
+     * @param  bool   $halt
      *
-     * @return bool|null
+     * @return mixed
      */
-    public function deleteChild(Model $model, $relation)
+    public function fireRevisionableEvent($event, array $payload, $halt = true)
     {
-        return $model->delete();
+        $event = "eloquent.{$event}: ".get_class($this);
+        $method = $halt ? 'until' : 'fire';
+
+        return static::$dispatcher->$method($event, array_merge([$this], $payload));
     }
 
     /**