Commit5d237ae

committed

[ValueExporter] added CallableToStringFormatter

1 parent95f2e99 commit5d237aeCopy full SHA for 5d237ae

File tree

+68

-1

lines changed

+68

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function exportValue($value, $depth = 1, $expand = false)`
`35`	`35`	`// Therefor, \Traversable instances might be treated as objects unless`
`36`	`36`	`// implementing a {@link StringFormatterInterface} and passing it to`
`37`	`37`	`// the exporter in order to support them.`
`38`		`-if (is_array($value)) {`
	`38`	`+if (is_array($value) && !is_callable($value)) {`
`39`	`39`	`if (empty($value)) {`
`40`	`40`	`return'array()';`
`41`	`41`	`}`

Lines changed: 53 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,53 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+/*`
	`4`	`+ * This file is part of the Symfony package.`
	`5`	`+ *`
	`6`	`+ * (c) Fabien Potencier <fabien@symfony.com>`
	`7`	`+ *`
	`8`	`+ * For the full copyright and license information, please view the LICENSE`
	`9`	`+ * file that was distributed with this source code.`
	`10`	`+ */`
	`11`	`+`
	`12`	`+namespaceSymfony\Component\ValueExporter\Formatter;`
	`13`	`+`
	`14`	`+/**`
	`15`	`+ * Returns a string representation of a string or array callable.`
	`16`	`+ *`
	`17`	`+ * @author Jules Pietri <jules@heahprod.com>`
	`18`	`+ */`
	`19`	`+class CallableToStringFormatterimplements StringFormatterInterface`
	`20`	`+{`
	`21`	`+`
	`22`	`+/**`
	`23`	`+ * {@inheritdoc}`
	`24`	`+ */`
	`25`	`+publicfunctionsupports($value)`
	`26`	`+ {`
	`27`	`+returnis_callable($value) && !$valueinstanceof \Closure;`
	`28`	`+ }`
	`29`	`+`
	`30`	`+/**`
	`31`	`+ * {@inheritdoc}`
	`32`	`+ */`
	`33`	`+publicfunctionformatToString($value)`
	`34`	`+ {`
	`35`	`+if (is_array($value)) {`
	`36`	`+$caller =is_object($value[0]) ?get_class($value[0]) :$value[0];`
	`37`	`+`
	`38`	`+if (isset($value[1])) {`
	`39`	`+$method =$value[1];`
	`40`	`+`
	`41`	`+if (false !==$cut =strpos($method,$caller)) {`
	`42`	`+$method =substr($method,$cut);`
	`43`	`+ }`
	`44`	`+`
	`45`	`+returnsprintf('(callable) "%s::%s"',$caller,$method);`
	`46`	`+ }`
	`47`	`+`
	`48`	`+returnsprintf('(invokable) "%s"',$caller);`
	`49`	`+ }`
	`50`	`+`
	`51`	`+returnsprintf('(callable) "%s"',$value);`
	`52`	`+ }`
	`53`	`+}`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,18 @@ public function testArrays()`
`47`	`47`	`$this->assertSame('array(0 => null, 1 => object(stdClass), "test" => array())', ValueExporter::export($array));`
`48`	`48`	`}`
`49`	`49`
	`50`	`+publicfunctiontestCallable()`
	`51`	`+ {`
	`52`	`+$closure =function() {};`
	`53`	`+$this->assertSame('object(Closure)', ValueExporter::export($closure));`
	`54`	`+`
	`55`	`+$string ='strlen';`
	`56`	`+$this->assertSame('(callable) "strlen"', ValueExporter::export($string));`
	`57`	`+`
	`58`	`+$array =array($this,'testCallable');`
	`59`	`+$this->assertSame('(callable) "Symfony\Component\ValueExporter\Tests\ValueExporterTest::testCallable"', ValueExporter::export($array));`
	`60`	`+ }`
	`61`	`+`
`50`	`62`	`publicfunctiontestDateTime()`
`51`	`63`	`{`
`52`	`64`	`$dateTime =new \DateTime('2014-06-10 07:35:40',new \DateTimeZone('UTC'));`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`useSymfony\Component\ValueExporter\Exporter\ValueExporterInterface;`
`15`	`15`	`useSymfony\Component\ValueExporter\Exporter\ValueToStringExporter;`
	`16`	`+useSymfony\Component\ValueExporter\Formatter\CallableToStringFormatter;`
`16`	`17`	`useSymfony\Component\ValueExporter\Formatter\DateTimeToStringFormatter;`
`17`	`18`	`useSymfony\Component\ValueExporter\Formatter\FormatterInterface;`
`18`	`19`	`useSymfony\Component\ValueExporter\Formatter\PhpIncompleteClassToStringFormatter;`
`@@ -35,6 +36,7 @@ public static function export($value, $depth = 1, $expand = false)`
`35`	`36`	`{`
`36`	`37`	`if (null ===self::$handler) {`
`37`	`38`	`$exporter =self::$exporter ?:newValueToStringExporter(`
	`39`	`+newCallableToStringFormatter(),`
`38`	`40`	`newDateTimeToStringFormatter(),`
`39`	`41`	`newPhpIncompleteClassToStringFormatter()`
`40`	`42`	`);`

Comments

(0)