- Added support for closure in Virtual field
This commit is contained in:
1 parent
756474d460
commit
a4b81f1932
2 files changed
+26
-10
No files matched your search
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user