Merge pull request #543 from doctrine/2.0.x-merge-up-into-2.1.x_c6vJpgoH

greg0ire · web-flow · commit d56f10d2caf3 · 2025-06-27T22:03:34.000+02:00
Merge release 2.0.3 into 2.1.x
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,5 +1,15 @@
 version: 2
 updates:
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "11:00"
+    open-pull-requests-limit: 10
+    labels:
+      - "Dependencies"
+    versioning-strategy: "increase-if-necessary"
+    target-branch: "1.8.x"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -11,4 +11,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@6.0.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.3.0"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -28,6 +28,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
         dependencies:
           - "highest"
         stability:
@@ -36,9 +37,6 @@ jobs:
           - php-version: "8.1"
             dependencies: "lowest"
             stability: "stable"
-          - php-version: "8.3"
-            dependencies: "highest"
-            stability: "dev"
 
     steps:
       - name: "Checkout"
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -17,4 +17,4 @@ on:
 jobs:
   documentation:
     name: "Documentation"
-    uses: "doctrine/.github/.github/workflows/documentation.yml@6.0.0"
+    uses: "doctrine/.github/.github/workflows/documentation.yml@7.3.0"
diff --git a/.github/workflows/release-on-milestone-closed.yml b/.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@6.0.0"
+    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 }}
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -11,4 +11,4 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/phpstan.yml@6.0.0"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@7.3.0"
diff --git a/composer.json b/composer.json
@@ -25,13 +25,13 @@
     },
     "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": "^1.10",
-        "phpunit/phpunit": "^10.5.3",
+        "phpstan/phpstan": "2.1.17",
+        "phpunit/phpunit": "10.5.45",
         "symfony/cache": "^6.4 || ^7",
         "symfony/var-exporter": "^6.4 || ^7"
     },
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/src/Purger/ORMPurger.php b/src/Purger/ORMPurger.php
@@ -13,7 +13,6 @@
 
 use function array_map;
 use function array_reverse;
-use function assert;
 use function count;
 use function in_array;
 
@@ -187,8 +186,7 @@ private function getCommitOrder(EntityManagerInterface $em, array $classes): arr
                     continue;
                 }
 
-                $targetClass = $em->getClassMetadata($assoc['targetEntity']);
-                assert($targetClass instanceof ClassMetadata);
+                $targetClass     = $em->getClassMetadata($assoc['targetEntity']);
                 $targetClassName = $targetClass->getName();
 
                 if (! $sorter->hasNode($targetClassName)) {
diff --git a/src/ReferenceRepository.php b/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
     {
diff --git a/tests/Common/DataFixtures/ReferenceRepositoryTest.php b/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]);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`
`13`	`13`	`use function array_key_exists;`
`14`	`14`	`use function array_keys;`
	`15`	`+use function array_map;`
`15`	`16`	`use function sprintf;`
`16`	`17`
`17`	`18`	`/**`
`@@ -25,7 +26,7 @@ class ReferenceRepository`
`25`	`26`	`* List of named references to the fixture objects`
`26`	`27`	`* gathered during fixure loading`
`27`	`28`	`*`
`28`		`- * @phpstan-var array<class-string, array<string, object>>`
	`29`	`+ * @phpstan-var array<class-string, array<string\|int, object>>`
`29`	`30`	`*/`
`30`	`31`	`private array $referencesByClass = [];`
`31`	`32`
`@@ -192,7 +193,7 @@ public function getReferenceNames(object $reference): array`
`192`	`193`	`return [];`
`193`	`194`	`}`
`194`	`195`
`195`		`- return array_keys($this->referencesByClass[$class], $reference, true);`
	`196`	`+ return array_map('strval', array_keys($this->referencesByClass[$class], $reference, true));`
`196`	`197`	`}`
`197`	`198`
`198`	`199`	`/**`
`@@ -218,7 +219,7 @@ public function getIdentitiesByClass(): array`
`218`	`219`	`/**`
`219`	`220`	`* Get all stored references`
`220`	`221`	`*`
`221`		`- * @phpstan-return array<class-string, array<string, object>>`
	`222`	`+ * @phpstan-return array<class-string, array<string\|int, object>>`
`222`	`223`	`*/`
`223`	`224`	`public function getReferencesByClass(): array`
`224`	`225`	`{`
`@@ -237,6 +238,8 @@ public function getManager(): ObjectManager`
`237`	`238`	`* Get real class name of a reference that could be a proxy`
`238`	`239`	`*`
`239`	`240`	`* @param string $className Class name of reference object`
	`241`	`+ *`
	`242`	`+ * @return class-string`
`240`	`243`	`*/`
`241`	`244`	`protected function getRealClass(string $className): string`
`242`	`245`	`{`