[VarDumper] Allow seamless use of Data clones

Author: nicolas-grekas

DataCollector/TranslationDataCollector.php

@@ -44,6 +44,8 @@ public function lateCollect()
 
         $this->data = $this->computeCount($messages);
         $this->data['messages'] = $messages;
+
+        $this->data = $this->cloneVar($this->data);
     }
 
     /**
@@ -101,12 +103,12 @@ private function sanitizeCollectedMessages($messages)
 
             if (!isset($result[$messageId])) {
                 $message['count'] = 1;
-                $message['parameters'] = !empty($message['parameters']) ? array($this->cloneVar($message['parameters'])) : array();
+                $message['parameters'] = !empty($message['parameters']) ? array($message['parameters']) : array();
                 $messages[$key]['translation'] = $this->sanitizeString($message['translation']);
                 $result[$messageId] = $message;
             } else {
                 if (!empty($message['parameters'])) {
-                    $result[$messageId]['parameters'][] = $this->cloneVar($message['parameters']);
+                    $result[$messageId]['parameters'][] = $message['parameters'];
                 }
 
                 ++$result[$messageId]['count'];

Tests/DataCollector/TranslationDataCollectorTest.php

@@ -14,7 +14,6 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Translation\DataCollectorTranslator;
 use Symfony\Component\Translation\DataCollector\TranslationDataCollector;
-use Symfony\Component\VarDumper\Cloner\VarCloner;
 
 class TranslationDataCollectorTest extends TestCase
 {
@@ -36,13 +35,11 @@ public function testCollectEmptyMessages()
         $this->assertEquals(0, $dataCollector->getCountMissings());
         $this->assertEquals(0, $dataCollector->getCountFallbacks());
         $this->assertEquals(0, $dataCollector->getCountDefines());
-        $this->assertEquals(array(), $dataCollector->getMessages());
+        $this->assertEquals(array(), $dataCollector->getMessages()->getValue());
     }
 
     public function testCollect()
     {
-        $cloner = new VarCloner();
-
         $collectedMessages = array(
             array(
                   'id' => 'foo',
@@ -119,9 +116,9 @@ public function testCollect()
                   'state' => DataCollectorTranslator::MESSAGE_MISSING,
                   'count' => 3,
                   'parameters' => array(
-                      $cloner->cloneVar(array('%count%' => 3)),
-                      $cloner->cloneVar(array('%count%' => 3)),
-                      $cloner->cloneVar(array('%count%' => 4, '%foo%' => 'bar')),
+                      array('%count%' => 3),
+                      array('%count%' => 3),
+                      array('%count%' => 4, '%foo%' => 'bar'),
                   ),
                   'transChoiceNumber' => 3,
             ),
@@ -136,7 +133,8 @@ public function testCollect()
         $this->assertEquals(1, $dataCollector->getCountMissings());
         $this->assertEquals(1, $dataCollector->getCountFallbacks());
         $this->assertEquals(1, $dataCollector->getCountDefines());
-        $this->assertEquals($expectedMessages, array_values($dataCollector->getMessages()));
+
+        $this->assertEquals($expectedMessages, array_values($dataCollector->getMessages()->getValue(true)));
     }
 
     private function getTranslator()