-

EasyCorp · Jul 10, 2024 · b5ea073 · b5ea073
1 parent c2aab1e
commit b5ea073
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Collection/EntityCollection.php b/src/Collection/EntityCollection.php
@@ -37,7 +37,7 @@ public function set(EntityDto $newOrUpdatedEntity): void
 
     public function first(): ?EntityDto
     {
-        return reset($this->entities);
+        return $this->entities[array_key_first($this->entities)] ?? null;
     }
 
     public function offsetExists(mixed $offset): bool

diff --git a/src/Orm/EntityRepository.php b/src/Orm/EntityRepository.php
@@ -262,7 +262,7 @@ private function getSearchablePropertiesConfig(QueryBuilder $queryBuilder, Searc
                 $associatedEntityAlias = $associatedPropertyName = '';
                 for ($i = 0; $i < $numAssociatedProperties - 1; ++$i) {
                     $associatedEntityName = $associatedProperties[$i];
-                    $associatedEntityAlias = Escaper::escapeDqlAlias($associatedEntityName).($i ?? '');
+                    $associatedEntityAlias = Escaper::escapeDqlAlias($associatedEntityName).((string) $i);
                     $associatedPropertyName = $associatedProperties[$i + 1];
 
                     if (!\in_array($associatedEntityAlias, $entitiesAlreadyJoined, true)) {