bug #47255 [Serializer] Fix get accessor regex in AnnotationLoader (jsor)

fabpot · fabpot · commit 105540452940 · 2022-08-12T08:27:08.000+02:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [Serializer] Fix get accessor regex in AnnotationLoader The pipe in the regex makes it match *all* methods. | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | n/a | License | MIT | Doc PR | n/a This fixes a bug introduced in #46958. It was also discovered in the PR but after it got merged. See #46958 (comment). Commits ------- 1132171 [Serializer] Fix get accessor regex in AnnotationLoader
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php
@@ -100,8 +100,7 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)
                 continue;
             }
 
-            $getAccessor = preg_match('/^(get|)(.+)$/i', $method->name);
-            if ($getAccessor && 0 !== $method->getNumberOfRequiredParameters()) {
+            if (0 === stripos($method->name, 'get') && $method->getNumberOfRequiredParameters()) {
                 continue; /*  matches the BC behavior in `Symfony\Component\Serializer\Normalizer\ObjectNormalizer::extractAttributes` */
             }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/Annotations/IgnoreDummyAdditionalGetter.php b/src/Symfony/Component/Serializer/Tests/Fixtures/Annotations/IgnoreDummyAdditionalGetter.php
@@ -20,4 +20,8 @@ public function getExtraValue(string $parameter)
     {
         return $parameter;
     }
+
+    public function setExtraValue2(string $parameter)
+    {
+    }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/Annotations/IgnoreDummyAdditionalGetterWithoutIgnoreAnnotations.php b/src/Symfony/Component/Serializer/Tests/Fixtures/Annotations/IgnoreDummyAdditionalGetterWithoutIgnoreAnnotations.php
@@ -15,4 +15,8 @@ public function getExtraValue(string $parameter)
     {
         return $parameter;
     }
+
+    public function setExtraValue2(string $parameter)
+    {
+    }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/Attributes/IgnoreDummyAdditionalGetter.php b/src/Symfony/Component/Serializer/Tests/Fixtures/Attributes/IgnoreDummyAdditionalGetter.php
@@ -18,4 +18,8 @@ public function getExtraValue(string $parameter)
     {
         return $parameter;
     }
+
+    public function setExtraValue2(string $parameter)
+    {
+    }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/Attributes/IgnoreDummyAdditionalGetterWithoutIgnoreAnnotations.php b/src/Symfony/Component/Serializer/Tests/Fixtures/Attributes/IgnoreDummyAdditionalGetterWithoutIgnoreAnnotations.php
@@ -15,4 +15,8 @@ public function getExtraValue(string $parameter)
     {
         return $parameter;
     }
+
+    public function setExtraValue2(string $parameter)
+    {
+    }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/AnnotationLoaderTest.php
@@ -157,6 +157,7 @@ public function testIgnoreGetterWirhRequiredParameterIfIgnoreAnnotationIsUsed()
 
         $attributes = $classMetadata->getAttributesMetadata();
         self::assertArrayNotHasKey('extraValue', $attributes);
+        self::assertArrayHasKey('extraValue2', $attributes);
     }
 
     public function testIgnoreGetterWirhRequiredParameterIfIgnoreAnnotationIsNotUsed()
@@ -166,6 +167,7 @@ public function testIgnoreGetterWirhRequiredParameterIfIgnoreAnnotationIsNotUsed
 
         $attributes = $classMetadata->getAttributesMetadata();
         self::assertArrayNotHasKey('extraValue', $attributes);
+        self::assertArrayHasKey('extraValue2', $attributes);
     }
 
     abstract protected function createLoader(): AnnotationLoader;

Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,7 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)`
`100`	`100`	`continue;`
`101`	`101`	`}`
`102`	`102`
`103`		`- $getAccessor = preg_match('/^(get\|)(.+)$/i', $method->name);`
`104`		`- if ($getAccessor && 0 !== $method->getNumberOfRequiredParameters()) {`
	`103`	`+ if (0 === stripos($method->name, 'get') && $method->getNumberOfRequiredParameters()) {`
`105`	`104`	continue; /* matches the BC behavior in `Symfony\Component\Serializer\Normalizer\ObjectNormalizer::extractAttributes` */
`106`	`105`	`}`
`107`	`106`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,8 @@ public function getExtraValue(string $parameter)`
`20`	`20`	`{`
`21`	`21`	`return $parameter;`
`22`	`22`	`}`
	`23`	`+`
	`24`	`+ public function setExtraValue2(string $parameter)`
	`25`	`+ {`
	`26`	`+ }`
`23`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,8 @@ public function getExtraValue(string $parameter)`
`15`	`15`	`{`
`16`	`16`	`return $parameter;`
`17`	`17`	`}`
	`18`	`+`
	`19`	`+ public function setExtraValue2(string $parameter)`
	`20`	`+ {`
	`21`	`+ }`
`18`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,8 @@ public function getExtraValue(string $parameter)`
`18`	`18`	`{`
`19`	`19`	`return $parameter;`
`20`	`20`	`}`
	`21`	`+`
	`22`	`+ public function setExtraValue2(string $parameter)`
	`23`	`+ {`
	`24`	`+ }`
`21`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ public function testIgnoreGetterWirhRequiredParameterIfIgnoreAnnotationIsUsed()`
`157`	`157`
`158`	`158`	`$attributes = $classMetadata->getAttributesMetadata();`
`159`	`159`	`self::assertArrayNotHasKey('extraValue', $attributes);`
	`160`	`+ self::assertArrayHasKey('extraValue2', $attributes);`
`160`	`161`	`}`
`161`	`162`
`162`	`163`	`public function testIgnoreGetterWirhRequiredParameterIfIgnoreAnnotationIsNotUsed()`
`@@ -166,6 +167,7 @@ public function testIgnoreGetterWirhRequiredParameterIfIgnoreAnnotationIsNotUsed`
`166`	`167`
`167`	`168`	`$attributes = $classMetadata->getAttributesMetadata();`
`168`	`169`	`self::assertArrayNotHasKey('extraValue', $attributes);`
	`170`	`+ self::assertArrayHasKey('extraValue2', $attributes);`
`169`	`171`	`}`
`170`	`172`
`171`	`173`	`abstract protected function createLoader(): AnnotationLoader;`