Merge pull request #510 from greg0ire/2.0.x

Merge 1.8.x up into 2.0.x
doctrine · Dec 10, 2024 · 2ae4513 · 2ae4513
2 parents 007bda9 + a8d9df5
commit 2ae4513
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -185,11 +185,6 @@ parameters:
 			count: 2
 			path: src/ReferenceRepository.php
 
-		-
-			message: "#^Method Doctrine\\\\Common\\\\DataFixtures\\\\ReferenceRepository\\:\\:getIdentifier\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/ReferenceRepository.php
-
 		-
 			message: "#^Parameter \\#1 \\$className of method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:getClassMetadata\\(\\) expects class\\-string\\<object\\>, string given\\.$#"
 			count: 1

diff --git a/src/ReferenceRepository.php b/src/ReferenceRepository.php
@@ -54,7 +54,7 @@ public function __construct(ObjectManager $manager)
      * @param object $reference Reference object
      * @param object $uow       Unit of work
      */
-    protected function getIdentifier(object $reference, object $uow): array
+    protected function getIdentifier(object $reference, object $uow): mixed
     {
         // In case Reference is not yet managed in UnitOfWork
         if (! $this->hasIdentifier($reference)) {
@@ -208,7 +208,7 @@ public function hasIdentity(string $name, string $class): bool
     /**
      * Get all stored identities
      *
-     * @phpstan-return array<class-string, array<string, object>>
+     * @phpstan-return array<class-string, array<string, mixed>>
      */
     public function getIdentitiesByClass(): array
     {