From bfc1e1cf934e57bd02ca9dc95900142e6071e892 Mon Sep 17 00:00:00 2001
From: Dave Mc Nicoll <info@mcnd.ca>
Date: Fri, 3 Nov 2023 19:45:21 -0400
Subject: [PATCH] - WIP on removing annotations

---
 src/Entity/EntityInterface.php | 22 ++++++++++++++++++++++
 src/EntityTrait.php            | 12 ++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 src/Entity/EntityInterface.php

diff --git a/src/Entity/EntityInterface.php b/src/Entity/EntityInterface.php
new file mode 100644
index 0000000..42b9cdb
--- /dev/null
+++ b/src/Entity/EntityInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Ulmus\Entity;
+
+use Ulmus\Common\{ EntityField, EntityResolver };
+use Ulmus\{ ConnectionAdapter, EntityCollection, Query\QueryBuilderInterface, Repository };
+
+interface EntityInterface /* extends \JsonSerializable */
+{
+    public function fromArray(iterable $dataset) : static;
+    public function entityGetDataset(bool $includeRelations = false, bool $returnSource = false) : array;
+    public function toArray($includeRelations = false, array $filterFields = null) : array;
+    public function toCollection() : EntityCollection;
+    public function isLoaded() : bool;
+    public function jsonSerialize() : mixed;
+    public static function resolveEntity() : EntityResolver;
+    public static function repository(string $alias = Repository::DEFAULT_ALIAS, ConnectionAdapter $adapter = null) : Repository;
+    public static function entityCollection(...$arguments) : EntityCollection;
+    public static function queryBuilder() : QueryBuilderInterface;
+    public static function field($name, null|string|bool $alias = Repository::DEFAULT_ALIAS) : EntityField;
+    public static function fields(array $fields, null|string|bool $alias = Repository::DEFAULT_ALIAS, string $separator = ', ') : string;
+}
\ No newline at end of file
diff --git a/src/EntityTrait.php b/src/EntityTrait.php
index 26a8723..7ce9392 100644
--- a/src/EntityTrait.php
+++ b/src/EntityTrait.php
@@ -4,9 +4,9 @@ namespace Ulmus;
 
 use Notes\Attribute\Ignore;
 use Psr\Http\Message\ServerRequestInterface;
-use Ulmus\{
-    Common\EntityResolver,
+use Ulmus\{Common\EntityResolver,
     Common\EntityField,
+    Query\QueryBuilderInterface,
     SearchRequest\SearchRequestInterface,
     SearchRequest\SearchRequestPaginationTrait};
 use Ulmus\Annotation\Classes\{ Method, Table, Collation, };
@@ -28,6 +28,10 @@ trait EntityTrait {
 
     #[Ignore]
     public function __construct(array $dataset = null) {
+        if ($dataset) {
+            $this->entityFillFromDataset($dataset);
+        }
+
         $this->resetVirtualProperties();
     }
 
@@ -136,7 +140,7 @@ trait EntityTrait {
     }
 
     #[Ignore]
-    public function fromArray(iterable $dataset) : self
+    public function fromArray(iterable $dataset) : static
     {
         return $this->entityFillFromDataset($dataset);
     }
@@ -300,7 +304,7 @@ trait EntityTrait {
     }
 
     #[Ignore]
-    public static function queryBuilder() : QueryBuilder
+    public static function queryBuilder() : QueryBuilderInterface
     {
         return Ulmus::queryBuilder(static::class);
     }