mcndave/ulmus
1
0
Fork 0
Code Issues 16 Pull Requests Projects 1 Releases Wiki Activity

- Added support for closure in Virtual field

Browse Source
This commit is contained in:
Dave Mc Nicoll 2023-11-07 11:01:55 -05:00
parent 756474d460
commit a4b81f1932
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Attribute/Property/Virtual.php
View File

@ -8,6 +8,14 @@ class Virtual extends Field {
public bool $readonly = true;
public function __construct(
public ? string $method = null,
) {}
public null|string|array $method = null,
public ? \Closure $closure = null,
) {
$this->method ??= [ static::class, 'noop' ];
}
public static function noop() : null
{
return null;
}
}

24
src/Repository/RelationBuilder.php
View File

@ -56,10 +56,10 @@ class RelationBuilder
}
if ( false !== $value = $this->resolveRelation($name) ) {
return $value;
return $value;
}
elseif ( false !== $value = $this->resolveVirtual($name) ) {
return $value;
elseif ( false !== $value = $this->resolveVirtual($name) ) {
return $value;
}
}
@ -78,11 +78,19 @@ class RelationBuilder
protected function resolveVirtual(string $name) : mixed
{
if (null !== ($virtual = $this->resolver->searchFieldAnnotation($name, [ Attribute\Property\Virtual::class, Annotation\Property\Virtual::class ]))) {
if ($virtual->closure ?? false) {
return call_user_func_array($virtual->closure, [ $this->entity ]);
}
try {
$arguments = [ $this->entity ];
return call_user_func_array([ $this->entity, $virtual->method ], [ $this->entity ]);
if ($virtual->closure ?? false) {
return call_user_func_array($virtual->closure, $arguments);
}
elseif ($virtual->method ?? false) {
return call_user_func_array(is_array($virtual->method) ? $virtual->method : [$this->entity, $virtual->method], $arguments);
}
}
catch(\Throwable $e) {
throw new $e(sprintf("An error occurred while calling method from your #[Virtual] attribute in entity '%s::%s'.", $this->entity::class, $name ));
}
}
return false;
@ -115,7 +123,7 @@ class RelationBuilder
$this->entity->eventExecute(Event\EntityRelationLoadInterface::class, $name, $this->repository);
return call_user_func([ $this->repository, $relation->function() ]);
return call_user_func([ $this->repository, $relation->function() ]);
case $relation->isManyToMany():
$this->manyToMany($name, $relation, $relationRelation);