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

Author: siganushka

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[$subject::class] ??= $this->getGetter($subject))($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) {
@@ -93,8 +93,8 @@ private function getGetter(object $subject): callable
         $method = 'get'.ucfirst($property);
 
         return match (self::getType($subject, $property, $method)) {
-            MarkingStoreMethod::METHOD => $subject->{$method}(...),
-            MarkingStoreMethod::PROPERTY => static fn () => $subject->{$property},
+            MarkingStoreMethod::METHOD => static fn ($subject) => $subject->{$method}(),
+            MarkingStoreMethod::PROPERTY => static fn ($subject) => $subject->{$property},
         };
     }
 

Tests/MarkingStore/MethodMarkingStoreTest.php

@@ -125,6 +125,23 @@ public function testGetMarkingWithUninitializedProperty2()
         $markingStore->getMarking($subject);
     }
 
+    public function testGetMarkingWithSameSubjectMultipleTimes()
+    {
+        $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) {