using abstract interface and model assertation directly instead

zemit-cms · Feb 24, 2024 · 12305d2 · 12305d2
1 parent fd9eda3
commit 12305d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Models/Interfaces/AbstractInterface.php b/src/Models/Interfaces/AbstractInterface.php
@@ -16,6 +16,4 @@ interface AbstractInterface extends ModelInterface
 {
     public function setId($id);
     public function getId();
-
-    public function toArray($columns = null, $useGetter = true): array;
 }
diff --git a/src/Mvc/Model/Behavior/Blameable.php b/src/Mvc/Model/Behavior/Blameable.php
@@ -11,10 +11,12 @@
 
 namespace Zemit\Mvc\Model\Behavior;
 
+use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Behavior;
 use Phalcon\Mvc\ModelInterface;
 use Zemit\Models\Audit;
 use Zemit\Models\AuditDetail;
+use Zemit\Models\Interfaces\AbstractInterface;
 use Zemit\Models\Interfaces\AuditDetailInterface;
 use Zemit\Models\Interfaces\AuditInterface;
 use Zemit\Models\User;
@@ -74,7 +76,7 @@ public function notify(string $type, ModelInterface $model)
      * Create new audit
      * Return true if the audit was created
      */
-    public function createAudit(string $type, ModelInterface $model): bool
+    public function createAudit(string $type, AbstractInterface $model): bool
     {
         $event = lcfirst(Helper::uncamelize(str_replace(['before', 'after'], ['', ''], $type)));
 
@@ -89,6 +91,7 @@ public function createAudit(string $type, ModelInterface $model): bool
 
         $audit = new $auditClass();
         assert($audit instanceof AuditInterface);
+        assert($audit instanceof Model);
 
         $audit->setModel(get_class($model));
         $audit->setTable($model->getSource());