Merge branch '4.3' into 4.4

* 4.3:
  [DI] fix locators with numeric keys
  Fix error when we use VO for the marking property

Author: nicolas-grekas

MarkingStore/MethodMarkingStore.php

@@ -61,7 +61,7 @@ public function getMarking($subject): Marking
         }
 
         if ($this->singleState) {
-            $marking = [$marking => 1];
+            $marking = [(string) $marking => 1];
         }
 
         return new Marking($marking);

Tests/MarkingStore/MethodMarkingStoreTest.php

@@ -52,4 +52,35 @@ public function testGetSetMarkingWithSingleState()
 
         $this->assertEquals($marking, $marking2);
     }
+
+    public function testGetMarkingWithValueObject()
+    {
+        $subject = new Subject($this->createValueObject('first_place'));
+
+        $markingStore = new MethodMarkingStore(true);
+
+        $marking = $markingStore->getMarking($subject);
+
+        $this->assertInstanceOf(Marking::class, $marking);
+        $this->assertCount(1, $marking->getPlaces());
+        $this->assertSame('first_place', (string) $subject->getMarking());
+    }
+
+    private function createValueObject(string $markingValue)
+    {
+        return new class($markingValue) {
+            /** @var string */
+            private $markingValue;
+
+            public function __construct(string $markingValue)
+            {
+                $this->markingValue = $markingValue;
+            }
+
+            public function __toString()
+            {
+                return $this->markingValue;
+            }
+        };
+    }
 }