- WIP on removing annotations

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);
     }