Merge branch '6.4' into 7.3

nicolas-grekas · nicolas-grekas · commit ab238200bdba · 2025-09-04T11:03:08.000+02:00
* 6.4:
  Replace backtick operator, deprecated in PHP 8.5, with shell_exec()
  [DependencyInjection] Add test case to ensure XML parse exception message includes filename and position
  [Serializer] Fix normalizing objects with accessors having the same name as a property
  [SecurityBundle] Prevent accessing the tracked token storage when collecting data
diff --git a/Normalizer/ObjectNormalizer.php b/Normalizer/ObjectNormalizer.php
@@ -88,24 +88,21 @@ protected function extractAttributes(object $object, ?string $format = null, arr
             $attributeName = null;
 
             // ctype_lower check to find out if method looks like accessor but actually is not, e.g. hash, cancel
-            if (3 < \strlen($name) && !ctype_lower($name[3]) && match ($name[0]) {
-                'g' => str_starts_with($name, 'get'),
-                'h' => str_starts_with($name, 'has'),
-                'c' => str_starts_with($name, 'can'),
+            if (match ($name[0]) {
+                'g' => str_starts_with($name, 'get') && isset($name[$i = 3]),
+                'h' => str_starts_with($name, 'has') && isset($name[$i = 3]),
+                'c' => str_starts_with($name, 'can') && isset($name[$i = 3]),
+                'i' => str_starts_with($name, 'is') && isset($name[$i = 2]),
                 default => false,
-            }) {
-                // getters, hassers and canners
-                $attributeName = substr($name, 3);
-
-                if (!$reflClass->hasProperty($attributeName)) {
-                    $attributeName = lcfirst($attributeName);
-                }
-            } elseif ('is' !== $name && str_starts_with($name, 'is') && !ctype_lower($name[2])) {
-                // issers
-                $attributeName = substr($name, 2);
-
-                if (!$reflClass->hasProperty($attributeName)) {
-                    $attributeName = lcfirst($attributeName);
+            } && !ctype_lower($name[$i])) {
+                if ($reflClass->hasProperty($name)) {
+                    $attributeName = $name;
+                } else {
+                    $attributeName = substr($name, $i);
+
+                    if (!$reflClass->hasProperty($attributeName)) {
+                        $attributeName = lcfirst($attributeName);
+                    }
                 }
             }
 
diff --git a/Tests/Normalizer/ObjectNormalizerTest.php b/Tests/Normalizer/ObjectNormalizerTest.php
@@ -980,6 +980,20 @@ public function testNormalizeWithMethodNamesSimilarToAccessors()
             123 => 321,
         ], $normalized);
     }
+
+    public function testNormalizeObjectWithBooleanPropertyAndIsserMethodWithSameName()
+    {
+        $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
+        $normalizer = new ObjectNormalizer($classMetadataFactory);
+
+        $object = new ObjectWithBooleanPropertyAndIsserWithSameName();
+        $normalized = $normalizer->normalize($object);
+
+        $this->assertSame([
+            'foo' => 'foo',
+            'isFoo' => true,
+        ], $normalized);
+    }
 }
 
 class ProxyObjectDummy extends ObjectDummy
@@ -1322,3 +1336,19 @@ public function isolate()
         $this->accessorishCalled = true;
     }
 }
+
+class ObjectWithBooleanPropertyAndIsserWithSameName
+{
+    private $foo = 'foo';
+    private $isFoo = true;
+
+    public function getFoo()
+    {
+        return $this->foo;
+    }
+
+    public function isFoo()
+    {
+        return $this->isFoo;
+    }
+}
