- WIP on attributes ; on testing phase

src/EntityTrait.php

@@ -66,7 +66,7 @@ trait EntityTrait {
             elseif ( EntityField::isScalarType($field['type']) ) {
 
                 if ( $field['type'] === 'string' ) {
-                    $annotation = $entityResolver->searchFieldAnnotation($field['name'], new Field() );
+                    $annotation = $entityResolver->searchFieldAnnotation($field['name'], [ Attribute\Property\Field::class, Field::class ] );
 
                     if ( $annotation->length ?? null ) {
                         $value = mb_substr($value, 0, $annotation->length);
@@ -90,7 +90,6 @@ trait EntityTrait {
                 }
                 catch(\Error $e) {
                     $f = $field['type'];
-                    dump($f, $f::from($value));
                     throw new \Error(sprintf("%s for class '%s' on field '%s'", $e->getMessage(), get_class($this), $field['name']));
                 }
             }
@@ -126,17 +125,11 @@ trait EntityTrait {
         return $this;
     }
 
-    /**
-     * @Ignore
-     */
     public function fromArray(iterable $dataset) : self
     {
         return $this->entityFillFromDataset($dataset);
     }
 
-    /**
-     * @Ignore
-     */
     public function entityGetDataset(bool $includeRelations = false, bool $returnSource = false) : array
     {
         if ( $returnSource ) {
@@ -148,7 +141,7 @@ trait EntityTrait {
         $entityResolver = $this->resolveEntity();
 
         foreach($entityResolver->fieldList(Common\EntityResolver::KEY_ENTITY_NAME, true) as $key => $field) {
-            $annotation = $entityResolver->searchFieldAnnotation($key, new Field() );
+            $annotation = $entityResolver->searchFieldAnnotation($key, [ Attribute\Property\Field::class, Field::class ]);
 
             if ( isset($this->$key) ) {
                 $dataset[$annotation->name ?? $key] = static::repository()->adapter->adapter()->writableValue($this->$key);
@@ -161,7 +154,7 @@ trait EntityTrait {
         # @TODO Must fix recursive bug !
         if ($includeRelations) {
             foreach($entityResolver->properties as $name => $field){
-                $relation = $entityResolver->searchFieldAnnotation($name, new Relation() );
+                $relation =  $entityResolver->searchFieldAnnotation($key, [ Attribute\Property\Relation::class. Relation::class ] );
 
                 if ( $relation && isset($this->$name) && ($relation->entity ?? $relation->bridge) !== static::class ) {
                     if ( null !== $value = $this->$name ?? null ) {
@@ -185,9 +178,6 @@ trait EntityTrait {
         return $dataset;
     }
 
-    /**
-     * @Ignore
-     */
     public function toArray($includeRelations = false, array $filterFields = null) : array
     {
         $dataset = $this->entityGetDataset($includeRelations);
@@ -195,17 +185,11 @@ trait EntityTrait {
         return $filterFields ? array_intersect_key($dataset, array_flip($filterFields)) : $dataset;
     }
 
-    /**
-     * @Ignore
-     */
     public function toCollection() : EntityCollection
     {
         return static::entityCollection([ $this ]);
     }
 
-    /**
-     * @Ignore
-     */
     public function isLoaded() : bool
     {
         if (empty($this->entityLoadedDataset)) {
@@ -221,9 +205,6 @@ trait EntityTrait {
         return isset($this->$key);
     }
 
-    /**
-     * @Ignore
-     */
     public function __get(string $name)
     {
         $relation = new Repository\RelationBuilder($this);
@@ -235,32 +216,25 @@ trait EntityTrait {
         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() ) ) {
+        $rel = static::resolveEntity()->searchFieldAnnotation($name, [ Attribute\Property\Relation::class, Relation::class ]);
+
+        if ( $this->isLoaded() && $rel ) {
             return true;
         }
 
         return isset($this->$name);
     }
 
-    /**
-     * @Ignore
-     */
     public function __sleep()
     {
         return array_keys($this->resolveEntity()->fieldList());
     }
 
-    /**
-     * @Ignore
-     */
     public function __clone()
     {
         foreach($this as $prop) {
@@ -274,33 +248,21 @@ trait EntityTrait {
         }
     }
 
-    /**
-     * @Ignore
-     */
     public function jsonSerialize()
     {
         return $this->entityGetDataset();
     }
 
-    /**
-     * @Ignore
-     */
     public static function resolveEntity() : EntityResolver
     {
         return Ulmus::resolveEntity(static::class);
     }
 
-    /**
-     * @Ignore
-     */
     public static function repository(string $alias = Repository::DEFAULT_ALIAS, ConnectionAdapter $adapter = null) : Repository
     {
         return Ulmus::repository(static::class, $alias, $adapter);
     }
 
-    /**
-     * @Ignore
-     */
     public static function entityCollection(...$arguments) : EntityCollection
     {
         $collection = new EntityCollection(...$arguments);
@@ -309,26 +271,16 @@ trait EntityTrait {
         return $collection;
     }
 
-    /**
-     * @Ignore
-     */
     public static function queryBuilder() : QueryBuilder
     {
         return Ulmus::queryBuilder(static::class);
     }
 
-    /**
-     * @Ignore
-     */
     public static function field($name, ? string $alias = Repository::DEFAULT_ALIAS) : EntityField
     {
-
         return new EntityField(static::class, $name, $alias ? Ulmus::repository(static::class)->adapter->adapter()->escapeIdentifier($alias, Adapter\AdapterInterface::IDENTIFIER_FIELD) : Repository::DEFAULT_ALIAS, Ulmus::resolveEntity(static::class));
     }
 
-    /**
-     * @Ignore
-     */
     public static function fields(array $fields, ? string $alias = Repository::DEFAULT_ALIAS) : string
     {
         return implode(', ', array_map(function($item) use ($alias){