Laravel 5.6 support added (barryvdh#784)

Jurager · barryvdh · commit b5d1df3238c8 · 2018-02-04T15:31:08.000+01:00
* Laravel 5.6 support added

Laravel 5.6 uses Symfony's http-kernel 4.0, exportValue has been deprecated since 3.2 and fully removed in 4.0

* Laravel 5.6 support added

Laravel 5.6 uses Symfony's http-kernel 4.0, exportValue has been deprecated since 3.2 and fully removed in 4.0
diff --git a/src/DataCollector/GateCollector.php b/src/DataCollector/GateCollector.php
@@ -5,7 +5,7 @@
 use DebugBar\DataCollector\MessagesCollector;
 use Illuminate\Contracts\Auth\Access\Gate;
 use Illuminate\Contracts\Auth\Access\Authorizable;
-use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
 
 /**
  * Collector for Laravel's Auth provider
@@ -20,7 +20,7 @@ class GateCollector extends MessagesCollector
     public function __construct(Gate $gate)
     {
         parent::__construct('gate');
-        $this->exporter = new ValueExporter();
+        $this->exporter = new VarCloner();
 
         $gate->after([$this, 'addCheck']);
     }
@@ -33,7 +33,7 @@ public function addCheck(Authorizable $user, $ability, $result, $arguments = [])
             'ability' => $ability,
             'result' => $result,
             snake_case(class_basename($user)) => $user->id,
-            'arguments' => $this->exporter->exportValue($arguments),
+            'arguments' => $this->exporter->cloneVar($arguments),
         ], $label, false);
     }
 }
diff --git a/src/DataCollector/ViewCollector.php b/src/DataCollector/ViewCollector.php
@@ -4,7 +4,7 @@
 
 use DebugBar\Bridge\Twig\TwigCollector;
 use Illuminate\View\View;
-use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
 
 class ViewCollector extends TwigCollector
 {
@@ -21,7 +21,7 @@ public function __construct($collectData = true)
         $this->collect_data = $collectData;
         $this->name = 'views';
         $this->templates = [];
-        $this->exporter = new ValueExporter();
+        $this->exporter = new VarCloner();
     }
 
     public function getName()
@@ -75,7 +75,7 @@ public function addView(View $view)
         } else {
             $data = [];
             foreach ($view->getData() as $key => $value) {
-                $data[$key] = $this->exporter->exportValue($value);
+                $data[$key] = $this->exporter->cloneVar($value);
             }
             $params = $data;
         }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use DebugBar\DataCollector\MessagesCollector;`
`6`	`6`	`use Illuminate\Contracts\Auth\Access\Gate;`
`7`	`7`	`use Illuminate\Contracts\Auth\Access\Authorizable;`
`8`		`-use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;`
	`8`	`+use Symfony\Component\VarDumper\Cloner\VarCloner;`
`9`	`9`
`10`	`10`	`/**`
`11`	`11`	`* Collector for Laravel's Auth provider`
`@@ -20,7 +20,7 @@ class GateCollector extends MessagesCollector`
`20`	`20`	`public function __construct(Gate $gate)`
`21`	`21`	`{`
`22`	`22`	`parent::__construct('gate');`
`23`		`- $this->exporter = new ValueExporter();`
	`23`	`+ $this->exporter = new VarCloner();`
`24`	`24`
`25`	`25`	`$gate->after([$this, 'addCheck']);`
`26`	`26`	`}`
`@@ -33,7 +33,7 @@ public function addCheck(Authorizable $user, $ability, $result, $arguments = [])`
`33`	`33`	`'ability' => $ability,`
`34`	`34`	`'result' => $result,`
`35`	`35`	`snake_case(class_basename($user)) => $user->id,`
`36`		`- 'arguments' => $this->exporter->exportValue($arguments),`
	`36`	`+ 'arguments' => $this->exporter->cloneVar($arguments),`
`37`	`37`	`], $label, false);`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use DebugBar\Bridge\Twig\TwigCollector;`
`6`	`6`	`use Illuminate\View\View;`
`7`		`-use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;`
	`7`	`+use Symfony\Component\VarDumper\Cloner\VarCloner;`
`8`	`8`
`9`	`9`	`class ViewCollector extends TwigCollector`
`10`	`10`	`{`
`@@ -21,7 +21,7 @@ public function __construct($collectData = true)`
`21`	`21`	`$this->collect_data = $collectData;`
`22`	`22`	`$this->name = 'views';`
`23`	`23`	`$this->templates = [];`
`24`		`- $this->exporter = new ValueExporter();`
	`24`	`+ $this->exporter = new VarCloner();`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public function getName()`
`@@ -75,7 +75,7 @@ public function addView(View $view)`
`75`	`75`	`} else {`
`76`	`76`	`$data = [];`
`77`	`77`	`foreach ($view->getData() as $key => $value) {`
`78`		`- $data[$key] = $this->exporter->exportValue($value);`
	`78`	`+ $data[$key] = $this->exporter->cloneVar($value);`
`79`	`79`	`}`
`80`	`80`	`$params = $data;`
`81`	`81`	`}`