fix: fixed State contamination in marking stores due to class-based getter cache

siganushka · siganushka · commit 3844f32bacd4 · 2025-10-29T11:24:30.000+08:00
diff --git a/src/Symfony/Component/Workflow/MarkingStore/MethodMarkingStore.php b/src/Symfony/Component/Workflow/MarkingStore/MethodMarkingStore.php
@@ -51,7 +51,7 @@ public function getMarking(object $subject): Marking
     {
         $marking = null;
         try {
-            $marking = ($this->getters[$subject::class] ??= $this->getGetter($subject))();
+            $marking = ($this->getters[self::getSubjectIdentity($subject)] ??= $this->getGetter($subject))();
         } catch (\Error $e) {
             $unInitializedPropertyMessage = \sprintf('Typed property %s::$%s must not be accessed before initialization', get_debug_type($subject), $this->property);
             if ($e->getMessage() !== $unInitializedPropertyMessage) {
@@ -84,7 +84,7 @@ public function setMarking(object $subject, Marking $marking, array $context = [
             $marking = key($marking);
         }
 
-        ($this->setters[$subject::class] ??= $this->getSetter($subject))($marking, $context);
+        ($this->setters[self::getSubjectIdentity($subject)] ??= $this->getSetter($subject))($marking, $context);
     }
 
     private function getGetter(object $subject): callable
@@ -109,6 +109,11 @@ private function getSetter(object $subject): callable
         };
     }
 
+    private static function getSubjectIdentity(object $subject): string
+    {
+        return sprintf('%s_%s', $subject::class, spl_object_id($subject));
+    }
+
     private static function getType(object $subject, string $property, string $method, ?string &$type = null): MarkingStoreMethod
     {
         try {
diff --git a/src/Symfony/Component/Workflow/Tests/MarkingStore/MethodMarkingStoreTest.php b/src/Symfony/Component/Workflow/Tests/MarkingStore/MethodMarkingStoreTest.php
@@ -125,6 +125,23 @@ public function testGetMarkingWithUninitializedProperty2()
         $markingStore->getMarking($subject);
     }
 
+    public function testGetMarkingWithSameSubjectMultipleTimes(): void
+    {
+        $subject1 = new Subject('first_place');
+        $subject2 = new Subject('second_place');
+        $subject3 = new Subject('third_place');
+
+        $markingStore = new MethodMarkingStore(true);
+
+        $marking1 = $markingStore->getMarking($subject1);
+        $marking2 = $markingStore->getMarking($subject2);
+        $marking3 = $markingStore->getMarking($subject3);
+
+        $this->assertSame(['first_place' => 1], $marking1->getPlaces());
+        $this->assertSame(['second_place' => 1], $marking2->getPlaces());
+        $this->assertSame(['third_place' => 1], $marking3->getPlaces());
+    }
+
     private function createValueObject(string $markingValue): object
     {
         return new class($markingValue) {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function getMarking(object $subject): Marking`
`51`	`51`	`{`
`52`	`52`	`$marking = null;`
`53`	`53`	`try {`
`54`		`- $marking = ($this->getters[$subject::class] ??= $this->getGetter($subject))();`
	`54`	`+ $marking = ($this->getters[self::getSubjectIdentity($subject)] ??= $this->getGetter($subject))();`
`55`	`55`	`} catch (\Error $e) {`
`56`	`56`	`$unInitializedPropertyMessage = \sprintf('Typed property %s::$%s must not be accessed before initialization', get_debug_type($subject), $this->property);`
`57`	`57`	`if ($e->getMessage() !== $unInitializedPropertyMessage) {`
`@@ -84,7 +84,7 @@ public function setMarking(object $subject, Marking $marking, array $context = [`
`84`	`84`	`$marking = key($marking);`
`85`	`85`	`}`
`86`	`86`
`87`		`- ($this->setters[$subject::class] ??= $this->getSetter($subject))($marking, $context);`
	`87`	`+ ($this->setters[self::getSubjectIdentity($subject)] ??= $this->getSetter($subject))($marking, $context);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`private function getGetter(object $subject): callable`
`@@ -109,6 +109,11 @@ private function getSetter(object $subject): callable`
`109`	`109`	`};`
`110`	`110`	`}`
`111`	`111`
	`112`	`+ private static function getSubjectIdentity(object $subject): string`
	`113`	`+ {`
	`114`	`+ return sprintf('%s_%s', $subject::class, spl_object_id($subject));`
	`115`	`+ }`
	`116`	`+`
`112`	`117`	`private static function getType(object $subject, string $property, string $method, ?string &$type = null): MarkingStoreMethod`
`113`	`118`	`{`
`114`	`119`	`try {`