From b5ea073cf36756e60e51cfdc9f5e86e82fb2ec71 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Wed, 10 Jul 2024 20:55:33 +0200
Subject: [PATCH] -

---
 src/Collection/EntityCollection.php | 2 +-
 src/Orm/EntityRepository.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Collection/EntityCollection.php b/src/Collection/EntityCollection.php
index a12b4cf812..0736d3c279 100644
--- 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
index 936420ab37..593ad63174 100644
--- 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)) {