Prepping everything for a PHP 8 release

This commit is contained in:
Dave Mc Nicoll committed 2022-10-10 14:26:27 +00:00
1 parent dfb84c104d
commit 0e8443b1c1
5 files changed
+35 -12

No files matched your search

+19 -3
View File
@@ -294,7 +294,20 @@ class Repository
$dataset = array_change_key_case($entity->entityGetDataset(false, true));
return array_diff_assoc($oldValues ? $dataset : $array , $oldValues ? $array : $dataset );
return array_udiff_assoc($oldValues ? $dataset : $array , $oldValues ? $array : $dataset, function($e1, $e2) {
if ( is_array($e1) ) {
if (is_array($e2)) {
return Ulmus::encodeArray($e1) !== Ulmus::encodeArray($e2);
}
else {
return false;
}
}
return (string) $e1 !== (string) $e2;
});
# return array_diff_assoc($oldValues ? $dataset : $array , $oldValues ? $array : $dataset );
}
@@ -606,11 +619,14 @@ class Repository
$field = clone $condition->field;
}
if ( $condition->field->entityClass === $entity ) {
/* @TODO FIX THIS !
*
* if ( $condition->field->entityClass === $entity ) {
if ( $this->entityClass === $entity ) {
$field->alias = $alias;
$join->where(is_object($field) ? $field : $entity::field($field, $alias), $condition->value, $condition->operator);
}
}*/
}
foreach($this->entityResolver->searchFieldAnnotationList($item, new FilterJoin() ) as $filter) {