- Some bugfixes applied live
This commit is contained in:
parent
c2cccc0222
commit
acab934f6f
|
@ -195,9 +195,9 @@ trait EntityTrait {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[Ignore]
|
#[Ignore]
|
||||||
public function toArray($includeRelations = false, array $filterFields = null) : array
|
public function toArray($includeRelations = false, array $filterFields = null, bool $rewriteValue = true) : array
|
||||||
{
|
{
|
||||||
$dataset = $this->entityGetDataset($includeRelations, false, false);
|
$dataset = $this->entityGetDataset($includeRelations, false, $rewriteValue);
|
||||||
|
|
||||||
return $filterFields ? array_intersect_key($dataset, array_flip($filterFields)) : $dataset;
|
return $filterFields ? array_intersect_key($dataset, array_flip($filterFields)) : $dataset;
|
||||||
}
|
}
|
||||||
|
|
|
@ -528,6 +528,7 @@ class QueryBuilder implements Query\QueryBuilderInterface
|
||||||
{
|
{
|
||||||
$this->values = $values;
|
$this->values = $values;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function nextJoinOrder() : float
|
protected function nextJoinOrder() : float
|
||||||
{
|
{
|
||||||
$next = 0;
|
$next = 0;
|
||||||
|
|
|
@ -450,7 +450,6 @@ class Repository
|
||||||
public function values(array $dataset) : self
|
public function values(array $dataset) : self
|
||||||
{
|
{
|
||||||
$this->queryBuilder->values($dataset);
|
$this->queryBuilder->values($dataset);
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -130,7 +130,7 @@ class RelationBuilder
|
||||||
|
|
||||||
$this->entity->eventExecute(Event\EntityRelationLoadInterface::class, $name, $this->repository);
|
$this->entity->eventExecute(Event\EntityRelationLoadInterface::class, $name, $this->repository);
|
||||||
|
|
||||||
$results = call_user_func([ $this->repository, $relationRelation->function() ]);
|
$results = call_user_func([ $this->repository, 'loadAll' /*$relationRelation->function()*/ ]);
|
||||||
|
|
||||||
if ($relation->bridgeField ?? false) {
|
if ($relation->bridgeField ?? false) {
|
||||||
$collection = $relation->bridge::entityCollection();
|
$collection = $relation->bridge::entityCollection();
|
||||||
|
|
Loading…
Reference in New Issue