From 2e377374d4491a39ed3c3a1ac0aea56b8bab7423 Mon Sep 17 00:00:00 2001
From: Dave Mc Nicoll <info@mcnd.ca>
Date: Wed, 8 Nov 2023 06:52:38 -0500
Subject: [PATCH] - Removed unused annotations

---
 src/EntityTrait.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/EntityTrait.php b/src/EntityTrait.php
index dddb375..44f14f1 100644
--- a/src/EntityTrait.php
+++ b/src/EntityTrait.php
@@ -6,13 +6,10 @@ use Notes\Attribute\Ignore;
 use Psr\Http\Message\ServerRequestInterface;
 use Ulmus\{Common\EntityResolver,
     Common\EntityField,
+    Entity\EntityInterface,
     Query\QueryBuilderInterface,
     SearchRequest\SearchRequestInterface,
     SearchRequest\SearchRequestPaginationTrait};
-use Ulmus\Annotation\Classes\{ Method, Table, Collation, };
-use Ulmus\Annotation\Property\{ Field, Filter, FilterJoin, Relation, OrderBy, Where, OrWhere, Join, Virtual, On, WithJoin, };
-use Ulmus\Annotation\Property\Field\{ PrimaryKey, Id, ForeignKey, CreatedAt, UpdatedAt, Datetime as DateTime, Date, Time, Bigint, Tinyint, Text, Mediumtext, Longtext, Blob, Mediumblob, Longblob, };
-use Ulmus\Annotation\Property\Relation\{ Ignore as RelationIgnore };
 
 trait EntityTrait {
     use EventTrait;
@@ -138,8 +135,12 @@ trait EntityTrait {
     }
 
     #[Ignore]
-    public function fromArray(iterable $dataset) : static
+    public function fromArray(iterable|EntityInterface $dataset) : static
     {
+        if ($dataset instanceof EntityInterface) {
+            $dataset = $dataset->toArray();
+        }
+
         return $this->entityFillFromDataset($dataset);
     }