Replaced use of removed ValueCollector with VarCloner (barryvdh#787)

A-Lawrence · barryvdh · commit 59a7a08d8411 · 2018-02-07T20:51:45.000+01:00
* Replaced use of removed ValueCollector with VarCloner

As per L5.6, Symfony 4 is now used.  As such, VarCloner must be used in place of ValueCollector.

* Changed PHPDoc for exporter.
diff --git a/src/DataCollector/EventCollector.php b/src/DataCollector/EventCollector.php
@@ -4,21 +4,21 @@
 use DebugBar\DataCollector\TimeDataCollector;
 use Illuminate\Events\Dispatcher;
 use Illuminate\Support\Str;
-use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
 
 class EventCollector extends TimeDataCollector
 {
     /** @var Dispatcher */
     protected $events;
 
-    /** @var ValueExporter */
+    /** @var VarCloner */
     protected $exporter;
 
     public function __construct($requestStartTime = null)
     {
         parent::__construct($requestStartTime);
 
-        $this->exporter = new ValueExporter();
+        $this->exporter = new VarCloner();
     }
 
     public function onWildcardEvent($name = null, $data = [])
@@ -76,7 +76,7 @@ protected function prepareParams($params)
             if (is_object($value) && Str::is('Illuminate\*\Events\*', get_class($value))) {
                 $value =  $this->prepareParams(get_object_vars($value));
             }
-            $data[$key] = htmlentities($this->exporter->exportValue($value), ENT_QUOTES, 'UTF-8', false);
+            $data[$key] = htmlentities($this->exporter->cloneVar($value), ENT_QUOTES, 'UTF-8', false);
         }
 
         return $data;

Original file line number	Diff line number	Diff line change
`@@ -4,21 +4,21 @@`
`4`	`4`	`use DebugBar\DataCollector\TimeDataCollector;`
`5`	`5`	`use Illuminate\Events\Dispatcher;`
`6`	`6`	`use Illuminate\Support\Str;`
`7`		`-use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;`
	`7`	`+use Symfony\Component\VarDumper\Cloner\VarCloner;`
`8`	`8`
`9`	`9`	`class EventCollector extends TimeDataCollector`
`10`	`10`	`{`
`11`	`11`	`/** @var Dispatcher */`
`12`	`12`	`protected $events;`
`13`	`13`
`14`		`- /** @var ValueExporter */`
	`14`	`+ /** @var VarCloner */`
`15`	`15`	`protected $exporter;`
`16`	`16`
`17`	`17`	`public function __construct($requestStartTime = null)`
`18`	`18`	`{`
`19`	`19`	`parent::__construct($requestStartTime);`
`20`	`20`
`21`		`- $this->exporter = new ValueExporter();`
	`21`	`+ $this->exporter = new VarCloner();`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public function onWildcardEvent($name = null, $data = [])`
`@@ -76,7 +76,7 @@ protected function prepareParams($params)`
`76`	`76`	`if (is_object($value) && Str::is('Illuminate\\Events\', get_class($value))) {`
`77`	`77`	`$value = $this->prepareParams(get_object_vars($value));`
`78`	`78`	`}`
`79`		`- $data[$key] = htmlentities($this->exporter->exportValue($value), ENT_QUOTES, 'UTF-8', false);`
	`79`	`+ $data[$key] = htmlentities($this->exporter->cloneVar($value), ENT_QUOTES, 'UTF-8', false);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`return $data;`