[PropertyInfo] Fix breaking change with has*(arguments...) methods

YaFou · YaFou · commit 25d1299e2eb8 · 2021-01-19T20:22:53.000+01:00
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -239,10 +239,12 @@ public function getReadInfo(string $class, string $property, array $context = []
         foreach ($this->accessorPrefixes as $prefix) {
             $methodName = $prefix.$camelProp;
 
-            if ($reflClass->hasMethod($methodName) && ($reflClass->getMethod($methodName)->getModifiers() & $this->methodReflectionFlags)) {
+            if ($reflClass->hasMethod($methodName)) {
                 $method = $reflClass->getMethod($methodName);
 
-                return new PropertyReadInfo(PropertyReadInfo::TYPE_METHOD, $methodName, $this->getReadVisiblityForMethod($method), $method->isStatic(), false);
+                if ($method->getModifiers() & $this->methodReflectionFlags && 0 === $method->getNumberOfRequiredParameters()) {
+                    return new PropertyReadInfo(PropertyReadInfo::TYPE_METHOD, $methodName, $this->getReadVisiblityForMethod($method), $method->isStatic(), false);
+                }
             }
         }
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -75,6 +75,7 @@ public function testGetProperties()
                 'xTotals',
                 'YT',
                 'date',
+                'element',
                 'c',
                 'd',
                 'e',
@@ -291,6 +292,7 @@ public function getReadableProperties()
             ['id', true],
             ['Guid', true],
             ['guid', false],
+            ['element', false],
         ];
     }
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
@@ -130,6 +130,8 @@ class Dummy extends ParentDummy
      */
     public $nestedIterators;
 
+    private $elements;
+
     public static function getStatic()
     {
     }
@@ -218,4 +220,8 @@ public function setDate(\DateTime $date)
     public function addDate(\DateTime $date)
     {
     }
+
+    public function hasElement(string $element): bool
+    {
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -239,10 +239,12 @@ public function getReadInfo(string $class, string $property, array $context = []`
`239`	`239`	`foreach ($this->accessorPrefixes as $prefix) {`
`240`	`240`	`$methodName = $prefix.$camelProp;`
`241`	`241`
`242`		`- if ($reflClass->hasMethod($methodName) && ($reflClass->getMethod($methodName)->getModifiers() & $this->methodReflectionFlags)) {`
	`242`	`+ if ($reflClass->hasMethod($methodName)) {`
`243`	`243`	`$method = $reflClass->getMethod($methodName);`
`244`	`244`
`245`		`- return new PropertyReadInfo(PropertyReadInfo::TYPE_METHOD, $methodName, $this->getReadVisiblityForMethod($method), $method->isStatic(), false);`
	`245`	`+ if ($method->getModifiers() & $this->methodReflectionFlags && 0 === $method->getNumberOfRequiredParameters()) {`
	`246`	`+ return new PropertyReadInfo(PropertyReadInfo::TYPE_METHOD, $methodName, $this->getReadVisiblityForMethod($method), $method->isStatic(), false);`
	`247`	`+ }`
`246`	`248`	`}`
`247`	`249`	`}`
`248`	`250`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,8 @@ class Dummy extends ParentDummy`
`130`	`130`	`*/`
`131`	`131`	`public $nestedIterators;`
`132`	`132`
	`133`	`+ private $elements;`
	`134`	`+`
`133`	`135`	`public static function getStatic()`
`134`	`136`	`{`
`135`	`137`	`}`
`@@ -218,4 +220,8 @@ public function setDate(\DateTime $date)`
`218`	`220`	`public function addDate(\DateTime $date)`
`219`	`221`	`{`
`220`	`222`	`}`
	`223`	`+`
	`224`	`+ public function hasElement(string $element): bool`
	`225`	`+ {`
	`226`	`+ }`
`221`	`227`	`}`