bug #26236 [PropertyInfo] ReflectionExtractor: give a chance to other extractors if no properties (dunglas)

fabpot · fabpot · commit ddc32e37b842 · 2018-02-19T21:28:07.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [PropertyInfo] ReflectionExtractor: give a chance to other extractors if no properties | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | #25803  | License | MIT | Doc PR | n/a For instance when using `__call()`, see #25803.  Commits ------- 270147b [PropertyInfo] ReflectionExtractor: give a chance to other extractors if no properties
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -76,7 +76,7 @@ public function getProperties($class, array $context = array())
             $properties[$propertyName] = $propertyName;
         }
 
-        return array_values($properties);
+        return $properties ? array_values($properties) : null;
     }
 
     /**
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php
@@ -57,6 +57,8 @@ public function testGetProperties()
             ),
             $this->extractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy')
         );
+
+        $this->assertNull($this->extractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\NoProperties'));
     }
 
     /**
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/NoProperties.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/NoProperties.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class NoProperties
+{
+}

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function getProperties($class, array $context = array())`
`76`	`76`	`$properties[$propertyName] = $propertyName;`
`77`	`77`	`}`
`78`	`78`
`79`		`- return array_values($properties);`
	`79`	`+ return $properties ? array_values($properties) : null;`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,8 @@ public function testGetProperties()`
`57`	`57`	`),`
`58`	`58`	`$this->extractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy')`
`59`	`59`	`);`
	`60`	`+`
	`61`	`+ $this->assertNull($this->extractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\NoProperties'));`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`/**`