[ValueExporter] added support for formatters FQCN instead of instances

HeahDude · HeahDude · commit 08d6b7668e7a · 2016-04-21T19:47:51.000+02:00
diff --git a/src/Symfony/Component/ValueExporter/Exporter/AbstractValueExporter.php b/src/Symfony/Component/ValueExporter/Exporter/AbstractValueExporter.php
@@ -39,19 +39,26 @@ abstract class AbstractValueExporter implements ValueExporterInterface
     protected $formatterInterface = FormatterInterface::class;
 
     /**
-     * An array of arrays of formatters by priority.
+     * An array of priorities by formatter class.
      *
      * @var array[]
      */
     private $formatters = array();
 
     /**
-     * A sorted array of formatters.
+     * An array of formatters instances sorted by priority or null.
      *
-     * @var FormatterInterface[]
+     * @var FormatterInterface[]|null
      */
     private $sortedFormatters;
 
+    /**
+     * An array of cached formatters instances by class.
+     *
+     * @var FormatterInterface[]
+     */
+    private $cachedFormatters = array();
+
     /**
      * Takes {@link FormatterInterface} as arguments.
      *
@@ -72,23 +79,19 @@ final public function addFormatters(array $formatters)
         foreach ($formatters as $formatter) {
             if (is_array($formatter)) {
                 $priority = (int) $formatter[1];
-                $formatter = $formatter[0];
+                $formatterClass = $formatter[0];
             } else {
                 $priority = 0;
+                $formatterClass = $formatter;
             }
 
-            $formatterClass = get_class($formatter);
-
-            if (!$formatter instanceof $this->formatterInterface) {
+            if (!in_array($this->formatterInterface, class_implements($formatterClass), true)) {
                 throw new InvalidFormatterException($formatterClass, static::class, $this->formatterInterface);
             }
 
-            if (in_array(ExpandedFormatterTrait::class, class_uses($formatterClass), true)) {
-                $formatter->setExporter($this);
-            }
-
-            // Using the class as key prevents duplicate
-            $this->formatters[$priority][$formatterClass] = $formatter;
+            // Using the class as key prevents duplicate and allows to
+            // dynamically change the priority
+            $this->formatters[$formatterClass] = $priority;
         }
     }
 
@@ -98,8 +101,24 @@ final public function addFormatters(array $formatters)
     final protected function formatters()
     {
         if (null === $this->sortedFormatters) {
-            krsort($this->formatters);
-            $this->sortedFormatters = call_user_func_array('array_merge', $this->formatters);
+            arsort($this->formatters);
+
+            foreach (array_keys($this->formatters) as $formatterClass) {
+                if (isset($this->cachedFormatters[$formatterClass])) {
+                    $this->sortedFormatters[] = $this->cachedFormatters[$formatterClass];
+
+                    continue;
+                }
+
+                $formatter = new $formatterClass();
+
+                if (in_array(ExpandedFormatterTrait::class, class_uses($formatterClass), true)) {
+                    /** @var ExpandedFormatterTrait $formatter */
+                    $formatter->setExporter($this);
+                }
+
+                $this->sortedFormatters[] = $this->cachedFormatters[$formatterClass] = $formatter;
+            }
         }
 
         return $this->sortedFormatters;
diff --git a/src/Symfony/Component/ValueExporter/Tests/ValueExporterTest.php b/src/Symfony/Component/ValueExporter/Tests/ValueExporterTest.php
@@ -52,7 +52,7 @@ public function testExportValueExpanded()
 
     public function testExportTraversable()
     {
-        ValueExporter::addFormatters(array(new TraversableToStringFormatter()));
+        ValueExporter::addFormatters(array(TraversableToStringFormatter::class));
 
         $value = new TraversableInstance();
         $exportedValue = <<<EOT
diff --git a/src/Symfony/Component/ValueExporter/ValueExporter.php b/src/Symfony/Component/ValueExporter/ValueExporter.php
@@ -36,10 +36,10 @@ public static function export($value, $depth = 1, $expand = false)
     {
         if (null === self::$handler) {
             $exporter = self::$exporter ?: new ValueToStringExporter(
-                new CallableToStringFormatter(),
-                new DateTimeToStringFormatter(),
-                new EntityToStringFormatter(),
-                new PhpIncompleteClassToStringFormatter()
+                CallableToStringFormatter::class,
+                DateTimeToStringFormatter::class,
+                EntityToStringFormatter::class,
+                PhpIncompleteClassToStringFormatter::class
             );
             $exporter->addFormatters(self::$formatters);
             // Clear formatters

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function testExportValueExpanded()`
`52`	`52`
`53`	`53`	`public function testExportTraversable()`
`54`	`54`	`{`
`55`		`- ValueExporter::addFormatters(array(new TraversableToStringFormatter()));`
	`55`	`+ ValueExporter::addFormatters(array(TraversableToStringFormatter::class));`
`56`	`56`
`57`	`57`	`$value = new TraversableInstance();`
`58`	`58`	`$exportedValue = <<<EOT`