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

- Some bugfixes applied live

This commit is contained in:
Dave Mc Nicoll 2023-11-08 09:27:03 -05:00
parent c2cccc0222
commit acab934f6f
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/EntityTrait.php
View File

@ -157,7 +157,7 @@ trait EntityTrait {
$annotation = $entityResolver->searchFieldAnnotation($key, [ Attribute\Property\Field::class, Field::class ]);
if ( isset($this->$key) ) {
$dataset[$annotation->name ?? $key] = $rewriteValue?
$dataset[$annotation->name ?? $key] = $rewriteValue ?
static::repository()->adapter->adapter()->writableValue($this->$key)
:
$this->$key;
@ -195,9 +195,9 @@ trait EntityTrait {
}
#[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;
}

1
src/QueryBuilder.php
View File

@ -528,6 +528,7 @@ class QueryBuilder implements Query\QueryBuilderInterface
{
$this->values = $values;
}
protected function nextJoinOrder() : float
{
$next = 0;

1
src/Repository.php
View File

@ -450,7 +450,6 @@ class Repository
public function values(array $dataset) : self
{
$this->queryBuilder->values($dataset);
return $this;
}

2
src/Repository/RelationBuilder.php
View File

@ -130,7 +130,7 @@ class RelationBuilder
$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) {
$collection = $relation->bridge::entityCollection();