bug #21332 [PropertyInfo] Don't try to access a property thru a static method (dunglas)

fabpot · fabpot · commit bfdac8530420 · 2017-01-18T11:21:25.000-08:00
This PR was merged into the 2.8 branch. Discussion ---------- [PropertyInfo] Don't try to access a property thru a static method | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a See also #21331. Commits ------- 3b4858f [PropertyInfo] Don't try to access a property thru a static method
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -253,6 +253,9 @@ private function getDocBlockFromMethod($class, $ucFirstProperty, $type)
 
             try {
                 $reflectionMethod = new \ReflectionMethod($class, $methodName);
+                if ($reflectionMethod->isStatic()) {
+                    continue;
+                }
 
                 if (
                     (self::ACCESSOR === $type && 0 === $reflectionMethod->getNumberOfRequiredParameters()) ||
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -262,6 +262,9 @@ private function getAccessorMethod($class, $property)
         foreach (self::$accessorPrefixes as $prefix) {
             try {
                 $reflectionMethod = new \ReflectionMethod($class, $prefix.$ucProperty);
+                if ($reflectionMethod->isStatic()) {
+                    continue;
+                }
 
                 if (0 === $reflectionMethod->getNumberOfRequiredParameters()) {
                     return array($reflectionMethod, $prefix);
@@ -290,6 +293,9 @@ private function getMutatorMethod($class, $property)
         foreach (self::$mutatorPrefixes as $prefix) {
             try {
                 $reflectionMethod = new \ReflectionMethod($class, $prefix.$ucProperty);
+                if ($reflectionMethod->isStatic()) {
+                    continue;
+                }
 
                 // Parameter can be optional to allow things like: method(array $foo = null)
                 if ($reflectionMethod->getNumberOfParameters() >= 1) {
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php
@@ -68,6 +68,8 @@ public function typesProvider()
             array('e', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_RESOURCE))), null, null),
             array('f', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTime'))), null, null),
             array('donotexist', null, null, null),
+            array('staticGetter', null, null, null),
+            array('staticSetter', null, null, null),
         );
     }
 }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php
@@ -72,6 +72,8 @@ public function typesProvider()
             array('e', null),
             array('f', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTime')))),
             array('donotexist', null),
+            array('staticGetter', null),
+            array('staticSetter', null),
         );
     }
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
@@ -55,6 +55,17 @@ public static function getStatic()
     {
     }
 
+    /**
+     * @return string
+     */
+    public static function staticGetter()
+    {
+    }
+
+    public static function staticSetter(\DateTime $d)
+    {
+    }
+
     /**
      * A.
      *

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,8 @@ public function typesProvider()`
`68`	`68`	`array('e', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_RESOURCE))), null, null),`
`69`	`69`	`array('f', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTime'))), null, null),`
`70`	`70`	`array('donotexist', null, null, null),`
	`71`	`+ array('staticGetter', null, null, null),`
	`72`	`+ array('staticSetter', null, null, null),`
`71`	`73`	`);`
`72`	`74`	`}`
`73`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,8 @@ public function typesProvider()`
`72`	`72`	`array('e', null),`
`73`	`73`	`array('f', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTime')))),`
`74`	`74`	`array('donotexist', null),`
	`75`	`+ array('staticGetter', null),`
	`76`	`+ array('staticSetter', null),`
`75`	`77`	`);`
`76`	`78`	`}`
`77`	`79`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,17 @@ public static function getStatic()`
`55`	`55`	`{`
`56`	`56`	`}`
`57`	`57`
	`58`	`+ /**`
	`59`	`+ * @return string`
	`60`	`+ */`
	`61`	`+ public static function staticGetter()`
	`62`	`+ {`
	`63`	`+ }`
	`64`	`+`
	`65`	`+ public static function staticSetter(\DateTime $d)`
	`66`	`+ {`
	`67`	`+ }`
	`68`	`+`
`58`	`69`	`/**`
`59`	`70`	`* A.`
`60`	`71`	`*`