object normalizer caught up with upstream

er1z · er1z · commit ebfbf168926b · 2024-09-21T19:55:42.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -100,7 +100,8 @@ protected function extractAttributes(object $object, ?string $format = null, arr
             $name = $reflMethod->name;
             $attributeName = null;
 
-            if (3 < \strlen($name) && match ($name[0]) {
+            // 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'),
@@ -112,7 +113,7 @@ protected function extractAttributes(object $object, ?string $format = null, arr
                 if (!$reflClass->hasProperty($attributeName)) {
                     $attributeName = lcfirst($attributeName);
                 }
-            } elseif ('is' !== $name && str_starts_with($name, 'is')) {
+            } elseif ('is' !== $name && str_starts_with($name, 'is') && !ctype_lower($name[2])) {
                 // issers
                 $attributeName = substr($name, 2);
 
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -942,6 +942,7 @@ public function testNormalizeWithMethodNamesSimilarToAccessors()
             'tell' => true,
             'class' => true,
             'responsibility' => true,
+            123 => 321
         ], $normalized);
     }
 }
@@ -1260,4 +1261,14 @@ public function hasResponsibility()
     {
         return true;
     }
+
+    public function get_foo()
+    {
+        return 'bar';
+    }
+
+    public function get123()
+    {
+        return 321;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -942,6 +942,7 @@ public function testNormalizeWithMethodNamesSimilarToAccessors()`
`942`	`942`	`'tell' => true,`
`943`	`943`	`'class' => true,`
`944`	`944`	`'responsibility' => true,`
	`945`	`+ 123 => 321`
`945`	`946`	`], $normalized);`
`946`	`947`	`}`
`947`	`948`	`}`
`@@ -1260,4 +1261,14 @@ public function hasResponsibility()`
`1260`	`1261`	`{`
`1261`	`1262`	`return true;`
`1262`	`1263`	`}`
	`1264`	`+`
	`1265`	`+ public function get_foo()`
	`1266`	`+ {`
	`1267`	`+ return 'bar';`
	`1268`	`+ }`
	`1269`	`+`
	`1270`	`+ public function get123()`
	`1271`	`+ {`
	`1272`	`+ return 321;`
	`1273`	`+ }`
`1263`	`1274`	`}`