[ValueExporter] tweaked CallableToStringFormatter

HeahDude · HeahDude · commit ab119f088ef9 · 2016-04-23T08:48:45.000+02:00
diff --git a/src/Symfony/Component/ValueExporter/Formatter/CallableToStringFormatter.php b/src/Symfony/Component/ValueExporter/Formatter/CallableToStringFormatter.php
@@ -36,7 +36,7 @@ public function formatToString($value)
         }
 
         $caller = is_object($value) ? get_class($value) : (is_object($value[0]) ? get_class($value[0]) : $value[0]);
-        if (is_object($value)) {
+        if (is_object($value) || (is_object($value[0]) && isset($value[1]) && '__invoke' === $value[1])) {
             return sprintf('(invokable) "%s"', $caller);
         }
 
@@ -45,6 +45,10 @@ public function formatToString($value)
             $method = substr($method, $cut);
         }
 
+        if ((new \ReflectionMethod($caller, $method))->isStatic()) {
+            return sprintf('(static) "%s::%s"', $caller, $method);
+        }
+
         return sprintf('(callable) "%s::%s"', $caller, $method);
     }
 }
diff --git a/src/Symfony/Component/ValueExporter/Tests/ValueExporterTest.php b/src/Symfony/Component/ValueExporter/Tests/ValueExporterTest.php
@@ -45,7 +45,7 @@ public function testExportValueExpanded()
 
         $exportedValue = <<<EOT
 array(
-  0 => (callable) "Symfony\Component\ValueExporter\ValueExporter::export"
+  0 => (static) "Symfony\Component\ValueExporter\ValueExporter::export"
 )
 EOT;
 
@@ -100,6 +100,7 @@ public function valueProvider()
                 '(callable) "Symfony\Component\ValueExporter\Tests\ValueExporterTest::testExportValue"',
             ),
             'invokable object' => array($this, '(invokable) "Symfony\Component\ValueExporter\Tests\ValueExporterTest"'),
+            'invokable object as array' => array(array($this, '__invoke'), '(invokable) "Symfony\Component\ValueExporter\Tests\ValueExporterTest"'),
             'datetime' => array(
                 new \DateTime('2014-06-10 07:35:40', new \DateTimeZone('UTC')),
                 'object(DateTime) - 2014-06-10T07:35:40+0000',

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function formatToString($value)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`$caller = is_object($value) ? get_class($value) : (is_object($value[0]) ? get_class($value[0]) : $value[0]);`
`39`		`- if (is_object($value)) {`
	`39`	`+ if (is_object($value) \|\| (is_object($value[0]) && isset($value[1]) && '__invoke' === $value[1])) {`
`40`	`40`	`return sprintf('(invokable) "%s"', $caller);`
`41`	`41`	`}`
`42`	`42`
`@@ -45,6 +45,10 @@ public function formatToString($value)`
`45`	`45`	`$method = substr($method, $cut);`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ if ((new \ReflectionMethod($caller, $method))->isStatic()) {`
	`49`	`+ return sprintf('(static) "%s::%s"', $caller, $method);`
	`50`	`+ }`
	`51`	`+`
`48`	`52`	`return sprintf('(callable) "%s::%s"', $caller, $method);`
`49`	`53`	`}`
`50`	`54`	`}`