Changed event class to be optional

Author: edstevo

src/Models/BaseModel.php

@@ -65,7 +65,7 @@ public function getIdField() : string
     /**
      * Expressive way to use the destroy method via dao repository
      *
-     * @return \EdStevo\Dao\Repositories\BaseModel
+     * @return \EdStevo\Dao\Models\BaseModel
      */
     public function daoUpdate(array $data = []) : BaseModel
     {
@@ -77,7 +77,7 @@ public function daoUpdate(array $data = []) : BaseModel
     /**
      * Expressive way to use the destroy method via dao repository
      *
-     * @return \EdStevo\Dao\Repositories\BaseModel
+     * @return \EdStevo\Dao\Models\BaseModel
      */
     public function daoIncrement(string $field = "", int $value = 1) : BaseModel
     {
@@ -127,7 +127,7 @@ public function daoGetRelationWhere(string $relation, array $constraints = []) :
      * @param string $relation
      * @param array  $data
      *
-     * @return \EdStevo\Dao\Repositories\BaseModel
+     * @return \EdStevo\Dao\Models\BaseModel
      */
     public function daoStoreRelation(string $relation, array $data = []) : BaseModel
     {
@@ -138,10 +138,10 @@ public function daoStoreRelation(string $relation, array $data = []) : BaseModel
      * Expressive way to use the update relation method with this model via the dao repository
      *
      * @param string $relationship
-     * @param \EdStevo\Dao\Repositories\BaseModel $relation
+     * @param \EdStevo\Dao\Models\BaseModel $relation
      * @param array  $data
      *
-     * @return \EdStevo\Dao\Repositories\BaseModel
+     * @return \EdStevo\Dao\Models\BaseModel
      */
     public function daoUpdateRelation(string $relationship, BaseModel $relation, array $data = []) : BaseModel
     {
@@ -152,7 +152,7 @@ public function daoUpdateRelation(string $relationship, BaseModel $relation, arr
      * Expressive way to use the update pivot method with this model via the dao repository
      *
      * @param string $relationship
-     * @param \EdStevo\Dao\Repositories\BaseModel $relation
+     * @param \EdStevo\Dao\Models\BaseModel $relation
      * @param array  $data
      *
      * @return int
@@ -166,7 +166,7 @@ public function daoUpdatePivot(string $relationship, BaseModel $relation, array
      * Expressive way to use the destroy relation method with this model via the dao repository
      *
      * @param string                           $relationship
-     * @param \EdStevo\Dao\Repositories\BaseModel $relation
+     * @param \EdStevo\Dao\Models\BaseModel $relation
      *
      * @return bool
      */
@@ -179,7 +179,7 @@ public function daoDestroyRelation(string $relationship, BaseModel $relation) :
      * Expressive way to use the attach method with this model via the dao repository
      *
      * @param string                              $relation
-     * @param \EdStevo\Dao\Repositories\BaseModel $model
+     * @param \EdStevo\Dao\Models\BaseModel $model
      * @param array                               $pivotData
      */
     public function daoAttach(string $relation, Model $model, array $pivotData = [])
@@ -242,7 +242,7 @@ public function getRules() : array
     /**
      * Return the dao repository related to this model
      *
-     * @return \EdStevo\Dao\Repositories\BaseModel
+     * @return \EdStevo\Dao\Models\BaseModel
      */
     public function getDaoRepository()
     {
@@ -252,7 +252,7 @@ public function getDaoRepository()
     /**
      * Flush this model's dao's cache
      *
-     * @return \EdStevo\Dao\Repositories\BaseModel
+     * @return \EdStevo\Dao\Models\BaseModel
      */
     public function flushDaoCache() : BaseModel
     {
@@ -264,7 +264,7 @@ public function flushDaoCache() : BaseModel
     /**
      * Flush this model's dao's cache
      *
-     * @return \EdStevo\Dao\Repositories\BaseModel
+     * @return \EdStevo\Dao\Models\BaseModel
      */
     public function flushModelCache() : BaseModel
     {
@@ -278,9 +278,10 @@ public function flushModelCache() : BaseModel
      *
      * @return string
      */
-    private function getModelName() : string
+    public function getModelName() : string
     {
-        return collect(explode('\\', get_class($this)))->last();
+        $namespace  = basename(get_class($this), ".php");
+        return collect(explode('\\', $namespace))->last();
     }
 
     /**

src/Repositories/DaoEventDispatcher.php

@@ -149,7 +149,11 @@ public function fire()
             return;
 
         $eventName  = $this->getEventNamespace();
-        broadcast(new $eventName($this->primaryModel, $this->relatedModel))->toOthers();
+
+        if(class_exists($eventName))
+        {
+            broadcast(new $eventName($this->primaryModel, $this->relatedModel))->toOthers();
+        }
     }
 
     /**
@@ -198,12 +202,12 @@ private function getEventsNamespace() : string
      */
     private function getEventNamespace() : string
     {
-        $modelName      = $this->getClassName($this->primaryModel->getModel());
+        $modelName      = $this->getClassName($this->primaryModel->getModelName());
         $eventString    = $this->getEventsNamespace() . $modelName;
 
         if ($this->relatedModel)
         {
-            $relatedName    = $this->getClassName($this->relatedModel->getModel());
+            $relatedName    = $this->getClassName($this->relatedModel->getModelName());
             $eventString    = $eventString . "\\" . $relatedName . "\\" . $relatedName;
         } else {
             $eventString    = $eventString . "\\" . $modelName . "\\" . $modelName;