Merge 1.8.x up into 2.0.x

.github/workflows/coding-standards.yml

@@ -11,4 +11,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.2.2"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.3.0"

.github/workflows/documentation.yml

@@ -17,4 +17,4 @@ on:
 jobs:
   documentation:
     name: "Documentation"
-    uses: "doctrine/.github/.github/workflows/documentation.yml@7.2.2"
+    uses: "doctrine/.github/.github/workflows/documentation.yml@7.3.0"

.github/workflows/release-on-milestone-closed.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.2.2"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@7.3.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -11,4 +11,4 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/phpstan.yml@7.2.2"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@7.3.0"

composer.json

@@ -25,12 +25,12 @@
     },
     "require-dev": {
         "ext-sqlite3": "*",
-        "doctrine/coding-standard": "^12",
+        "doctrine/coding-standard": "^13",
         "doctrine/dbal": "^3.5 || ^4",
         "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0",
         "doctrine/orm": "^2.14 || ^3",
         "fig/log-test": "^1",
-        "phpstan/phpstan": "2.1.8",
+        "phpstan/phpstan": "2.1.17",
         "phpunit/phpunit": "10.5.45",
         "symfony/cache": "^6.4 || ^7",
         "symfony/var-exporter": "^6.4 || ^7"

phpstan-baseline.neon

@@ -234,18 +234,6 @@ parameters:
 			count: 1
 			path: src/ReferenceRepository.php
 
-		-
-			message: '#^Property Doctrine\\Common\\DataFixtures\\ReferenceRepository\:\:\$identitiesByClass \(array\<class\-string, array\<string, mixed\>\>\) does not accept array\<string, array\<string, mixed\>\>\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: src/ReferenceRepository.php
-
-		-
-			message: '#^Property Doctrine\\Common\\DataFixtures\\ReferenceRepository\:\:\$referencesByClass \(array\<class\-string, array\<string, object\>\>\) does not accept array\<string, array\<string, object\>\>\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: src/ReferenceRepository.php
-
 		-
 			message: '#^Unable to resolve the template type T in call to method Doctrine\\Persistence\\ObjectManager\:\:getClassMetadata\(\)$#'
 			identifier: argument.templateType

src/ReferenceRepository.php

@@ -12,6 +12,7 @@
 
 use function array_key_exists;
 use function array_keys;
+use function array_map;
 use function sprintf;
 
 /**
@@ -25,7 +26,7 @@ class ReferenceRepository
      * List of named references to the fixture objects
      * gathered during fixure loading
      *
-     * @phpstan-var array<class-string, array<string, object>>
+     * @phpstan-var array<class-string, array<string|int, object>>
      */
     private array $referencesByClass = [];
 
@@ -192,7 +193,7 @@ public function getReferenceNames(object $reference): array
             return [];
         }
 
-        return array_keys($this->referencesByClass[$class], $reference, true);
+        return array_map('strval', array_keys($this->referencesByClass[$class], $reference, true));
     }
 
     /**
@@ -218,7 +219,7 @@ public function getIdentitiesByClass(): array
     /**
      * Get all stored references
      *
-     * @phpstan-return array<class-string, array<string, object>>
+     * @phpstan-return array<class-string, array<string|int, object>>
      */
     public function getReferencesByClass(): array
     {
@@ -237,6 +238,8 @@ public function getManager(): ObjectManager
      * Get real class name of a reference that could be a proxy
      *
      * @param string $className Class name of reference object
+     *
+     * @return class-string
      */
     protected function getRealClass(string $className): string
     {

tests/Common/DataFixtures/ReferenceRepositoryTest.php

@@ -242,4 +242,25 @@ public function testGetIdentifierWhenHasNotBeenManagedYetByUnitOfWork(): void
 
         $this->assertEquals($identitiesExpected, $identities['entity']);
     }
+
+    public function testGivenAReferenceWithNameWithIntegerValueWhenGetReferenceNamesOfEntitiesThenReturnNamesInStringType(): void
+    {
+        $em                  = $this->getMockSqliteEntityManager();
+        $referenceRepository = new ReferenceRepository($em);
+
+        $schemaTool = new SchemaTool($em);
+        $schemaTool->dropSchema([]);
+        $schemaTool->createSchema([$em->getClassMetadata(Role::class)]);
+
+        $role = new Role();
+        $role->setName('role_name');
+        $em->persist($role);
+        $em->flush();
+
+        $name = (string) $role->getId();
+        $referenceRepository->setReference($name, $role);
+        $names = $referenceRepository->getReferenceNames($role);
+        $this->assertCount(1, $names);
+        $this->assertSame('1', $names[0]);
+    }
 }