- Work done on Ulmus which were added within the Bottin de suppléance app

src/EntityTrait.php

@@ -8,7 +8,7 @@ use Ulmus\Repository,
     Ulmus\Common\EntityField;
 
 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, Filter, Relation, OrderBy, Where, Join, Virtual, On, WithJoin, };
 use Ulmus\Annotation\Property\Field\{ Id, ForeignKey, CreatedAt, UpdatedAt, Datetime as DateTime, Date, Time, Bigint, Tinyint, Text, Mediumtext, Longtext, };
 use Ulmus\Annotation\Property\Relation\{ Ignore as RelationIgnore };
 
@@ -29,37 +29,8 @@ trait EntityTrait {
      * @Ignore
      */
     public array $entityLoadedDataset = [];
-
-    /**
-     * @Ignore
-     */
-    public function __get(string $name)
-    {
-        $relation = new Repository\RelationBuilder($this);
-        
-        if ( false !== $data = $relation->searchRelation($name) ) {
-            return $this->$name = $data;
-        }
-        
-        throw new \Exception(sprintf("[%s] - Undefined variable: %s", static::class, $name));
-    }
     
-    /**
-     * @Ignore
-     */
-    public function __isset(string $name) : bool
-    {
-        #if ( null !== $relation = static::resolveEntity()->searchFieldAnnotation($name, new Relation() ) ) {
-        #    return isset($this->{$relation->key});
-        #}
-        if ( $this->isLoaded() && static::resolveEntity()->searchFieldAnnotation($name, new Relation() ) ) {
-           return true;
-        }
-
-        return isset($this->$name);
-    }
-    
-    /**
+    /**entityLoadedDataset
      * @Ignore
      */
     public function entityFillFromDataset(iterable $dataset) : self
@@ -70,11 +41,9 @@ trait EntityTrait {
         
         foreach($dataset as $key => $value) {
             $field = $entityResolver->field(strtolower($key), EntityResolver::KEY_COLUMN_NAME, false) ?? null;
-            
-            if ( $field === null ) {
-                $field = $entityResolver->field(strtolower($key), EntityResolver::KEY_LC_ENTITY_NAME, false);
-            }
-            
+
+            $field ??= $entityResolver->field(strtolower($key), EntityResolver::KEY_LC_ENTITY_NAME, false);
+
             if ( $field === null ) {
                 if ($this->entityStrictFieldsDeclaration ) {
                     throw new \Exception("Field `$key` can not be found within your entity ".static::class);
@@ -98,23 +67,28 @@ trait EntityTrait {
 
                 if ( $field['type'] === 'string' ) {
                     $annotation = $entityResolver->searchFieldAnnotation($field['name'], new Field() );
-                
+
                     if ( $annotation->length ?? null ) {
                         $value = substr($value, 0, $annotation->length);
                     }
                 }
                 elseif ( $field['type'] === 'bool' ) {
-                    $this->{$field['name']} = (bool) $value;
+                    $value = (bool) $value;
                 }
 
                 $this->{$field['name']} = $value;
             }
             elseif ( ! $field['builtin'] ) {
-                $this->{$field['name']} = Ulmus::instanciateObject($field['type'], [ $value ]);
+                try {
+                    $this->{$field['name']} = Ulmus::instanciateObject($field['type'], [ $value ]);
+                }
+                catch(\Error $e) {
+                    throw new \Error(sprintf("%s for class '%s' on field '%s'", $e->getMessage(), get_class($this), $field['name']));
+                }
             }
             
             # Keeping original data to diff on UPDATE query
-            if ( ! $loaded || $isLoadedDataset ) {
+            if ( ! $loaded /* || $isLoadedDataset */ ) {
                 #if ( $field !== null ) {
                 #    $annotation = $entityResolver->searchFieldAnnotation($field['name'], new Field() );
                 #    $this->entityLoadedDataset[$annotation ? $annotation->name : $field['name']] = $dataset;       # <--------- THIS TO FIX !!!!!!
@@ -250,7 +224,36 @@ trait EntityTrait {
     /**
      * @Ignore
      */
-    public function __sleep() 
+    public function __get(string $name)
+    {
+        $relation = new Repository\RelationBuilder($this);
+
+        if ( false !== $data = $relation->searchRelation($name) ) {
+            return $this->$name = $data;
+        }
+
+        throw new \Exception(sprintf("[%s] - Undefined variable: %s", static::class, $name));
+    }
+
+    /**
+     * @Ignore
+     */
+    public function __isset(string $name) : bool
+    {
+        #if ( null !== $relation = static::resolveEntity()->searchFieldAnnotation($name, new Relation() ) ) {
+        #    return isset($this->{$relation->key});
+        #}
+        if ( $this->isLoaded() && static::resolveEntity()->searchFieldAnnotation($name, new Relation() ) ) {
+            return true;
+        }
+
+        return isset($this->$name);
+    }
+
+    /**
+     * @Ignore
+     */
+    public function __sleep()
     {
         return array_keys($this->resolveEntity()->fieldList());
     }
@@ -306,6 +309,15 @@ trait EntityTrait {
         return $collection;
     }
 
+
+    /**
+     * @Ignore
+     */
+    public static function queryBuilder() : QueryBuilder
+    {
+        return Ulmus::queryBuilder(static::class);
+    }
+
     /**
      * @Ignore
      */