Fix

sonata-project · Jun 19, 2024 · b4741b8 · b4741b8
1 parent 2aa11f1
commit b4741b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Model/ModelManager.php b/src/Model/ModelManager.php
@@ -191,7 +191,7 @@ public function getIdentifierValues(object $model): array
 
     public function getIdentifierFieldNames(string $class): array
     {
-        return array_filter($this->getMetadata($class)->getIdentifier());
+        return array_filter($this->getMetadata($class)->getIdentifier(), static fn (?string $id) => null !== $id);
     }
 
     public function getNormalizedIdentifier(object $model): ?string

diff --git a/tests/Model/ModelManagerTest.php b/tests/Model/ModelManagerTest.php
@@ -327,8 +327,9 @@ public function testFailingBatchDelete(string $expectedExceptionMessage, array $
             Configuration::AUTOGENERATE_FILE_NOT_EXISTS
         );
         $uow = new UnitOfWork($dm, $eventManager, $hydratorFactory);
-        /** @psalm-suppress InternalMethod */
-        $hydratorFactory->setUnitOfWork($uow);
+        if (method_exists($hydratorFactory, 'setUnitOfWork')) {
+            $hydratorFactory->setUnitOfWork($uow);
+        }
 
         $dm
             ->expects(static::atLeastOnce())