Laravel 5.6 updates

Travis config update

Removed HHVM script as Laravel no longer support HHVM after releasing 5.3

vendor/symfony/var-dumper/Tests/Dumper/CliDumperTest.php

@@ -48,7 +48,6 @@ class CliDumperTest extends TestCase
         $intMax = PHP_INT_MAX;
         $res = (int) $var['res'];
 
-        $r = \defined('HHVM_VERSION') ? '' : '#%d';
         $this->assertStringMatchesFormat(
             <<<EOTXT
 array:24 [
@@ -76,9 +75,9 @@ array:24 [
     +foo: "foo"
     +"bar": "bar"
   }
-  "closure" => Closure {{$r}
+  "closure" => Closure {#%d
     class: "Symfony\Component\VarDumper\Tests\Dumper\CliDumperTest"
-    this: Symfony\Component\VarDumper\Tests\Dumper\CliDumperTest {{$r} …}
+    this: Symfony\Component\VarDumper\Tests\Dumper\CliDumperTest {#%d …}
     parameters: {
       \$a: {}
       &\$b: {
@@ -290,10 +289,6 @@ EOTXT
 
     public function testClosedResource()
     {
-        if (\defined('HHVM_VERSION') && HHVM_VERSION_ID < 30600) {
-            $this->markTestSkipped();
-        }
-
         $var = fopen(__FILE__, 'r');
         fclose($var);
 
@@ -384,11 +379,10 @@ EOTXT
         $dumper->dump($data, $out);
         $out = stream_get_contents($out, -1, 0);
 
-        $r = \defined('HHVM_VERSION') ? '' : '#%d';
         $this->assertStringMatchesFormat(
             <<<EOTXT
 stream resource {@{$ref}
-  ⚠: Symfony\Component\VarDumper\Exception\ThrowingCasterException {{$r}
+  ⚠: Symfony\Component\VarDumper\Exception\ThrowingCasterException {#%d
     #message: "Unexpected Exception thrown from a caster: Foobar"
     trace: {
       %sTwig.php:2 {
@@ -429,10 +423,9 @@ EOTXT
         $data = $cloner->cloneVar($var);
         $out = $dumper->dump($data, true);
 
-        $r = \defined('HHVM_VERSION') ? '' : '#%d';
         $this->assertStringMatchesFormat(
             <<<EOTXT
-{{$r}
+{#%d
   +"foo": &1 "foo"
   +"bar": &1 "foo"
 }
@@ -446,7 +439,6 @@ EOTXT
     /**
      * @runInSeparateProcess
      * @preserveGlobalState disabled
-     * @requires PHP 5.6
      */
     public function testSpecialVars56()
     {
@@ -477,7 +469,7 @@ EOTXT
      * @runInSeparateProcess
      * @preserveGlobalState disabled
      */
-    public function testGlobalsNoExt()
+    public function testGlobals()
     {
         $var = $this->getSpecialVars();
         unset($var[0]);
@@ -491,10 +483,6 @@ EOTXT
         $dumper->setColors(false);
         $cloner = new VarCloner();
 
-        $refl = new \ReflectionProperty($cloner, 'useExt');
-        $refl->setAccessible(true);
-        $refl->setValue($cloner, false);
-
         $data = $cloner->cloneVar($var);
         $dumper->dump($data);
 
@@ -509,47 +497,6 @@ array:2 [
   2 => &1 array:1 [&1]
 ]
 
-EOTXT
-            ,
-            $out
-        );
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testBuggyRefs()
-    {
-        if (\PHP_VERSION_ID >= 50600) {
-            $this->markTestSkipped('PHP 5.6 fixed refs counting');
-        }
-
-        $var = $this->getSpecialVars();
-        $var = $var[0];
-
-        $dumper = new CliDumper();
-        $dumper->setColors(false);
-        $cloner = new VarCloner();
-
-        $data = $cloner->cloneVar($var)->withMaxDepth(3);
-        $out = '';
-        $dumper->dump($data, function ($line, $depth) use (&$out) {
-            if ($depth >= 0) {
-                $out .= str_repeat('  ', $depth).$line."\n";
-            }
-        });
-
-        $this->assertSame(
-            <<<'EOTXT'
-array:1 [
-  0 => array:1 [
-    0 => array:1 [
-      0 => array:1 [ …1]
-    ]
-  ]
-]
-
 EOTXT
             ,
             $out

vendor/symfony/var-dumper/Tests/Dumper/HtmlDumperTest.php

@@ -51,7 +51,6 @@ class HtmlDumperTest extends TestCase
         $dumpId = $dumpId[0];
         $res = (int) $var['res'];
 
-        $r = \defined('HHVM_VERSION') ? '' : '<a class=sf-dump-ref>#%d</a>';
         $this->assertStringMatchesFormat(
             <<<EOTXT
 <foo></foo><bar><span class=sf-dump-note>array:24</span> [<samp>
@@ -79,10 +78,10 @@ class HtmlDumperTest extends TestCase
     +<span class=sf-dump-public title="Public property">foo</span>: "<span class=sf-dump-str title="3 characters">foo</span>"
     +"<span class=sf-dump-public title="Runtime added dynamic property">bar</span>": "<span class=sf-dump-str title="3 characters">bar</span>"
   </samp>}
-  "<span class=sf-dump-key>closure</span>" => <span class=sf-dump-note>Closure</span> {{$r}<samp>
+  "<span class=sf-dump-key>closure</span>" => <span class=sf-dump-note>Closure</span> {<a class=sf-dump-ref>#%d</a><samp>
     <span class=sf-dump-meta>class</span>: "<span class=sf-dump-str title="Symfony\Component\VarDumper\Tests\Dumper\HtmlDumperTest
 55 characters"><span class="sf-dump-ellipsis sf-dump-ellipsis-class">Symfony\Component\VarDumper\Tests\Dumper</span><span class=sf-dump-ellipsis>\</span>HtmlDumperTest</span>"
-    <span class=sf-dump-meta>this</span>: <abbr title="Symfony\Component\VarDumper\Tests\Dumper\HtmlDumperTest" class=sf-dump-note>HtmlDumperTest</abbr> {{$r} &%s;}
+    <span class=sf-dump-meta>this</span>: <abbr title="Symfony\Component\VarDumper\Tests\Dumper\HtmlDumperTest" class=sf-dump-note>HtmlDumperTest</abbr> {<a class=sf-dump-ref>#%d</a> &%s;}
     <span class=sf-dump-meta>parameters</span>: {<samp>
       <span class=sf-dump-meta>\$a</span>: {}
       <span class=sf-dump-meta>&amp;\$b</span>: {<samp>

vendor/symfony/var-dumper/Tests/Dumper/ServerDumperTest.php

@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Dumper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Process\PhpProcess;
+use Symfony\Component\Process\Process;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\ContextProvider\ContextProviderInterface;
+use Symfony\Component\VarDumper\Dumper\DataDumperInterface;
+use Symfony\Component\VarDumper\Dumper\ServerDumper;
+
+class ServerDumperTest extends TestCase
+{
+    private const VAR_DUMPER_SERVER = 'tcp://127.0.0.1:9913';
+
+    public function testDumpForwardsToWrappedDumperWhenServerIsUnavailable()
+    {
+        $wrappedDumper = $this->getMockBuilder(DataDumperInterface::class)->getMock();
+
+        $dumper = new ServerDumper(self::VAR_DUMPER_SERVER, $wrappedDumper);
+
+        $cloner = new VarCloner();
+        $data = $cloner->cloneVar('foo');
+
+        $wrappedDumper->expects($this->once())->method('dump')->with($data);
+
+        $dumper->dump($data);
+    }
+
+    public function testDump()
+    {
+        $wrappedDumper = $this->getMockBuilder(DataDumperInterface::class)->getMock();
+        $wrappedDumper->expects($this->never())->method('dump'); // test wrapped dumper is not used
+
+        $cloner = new VarCloner();
+        $data = $cloner->cloneVar('foo');
+        $dumper = new ServerDumper(self::VAR_DUMPER_SERVER, $wrappedDumper, array(
+            'foo_provider' => new class() implements ContextProviderInterface {
+                public function getContext(): ?array
+                {
+                    return array('foo');
+                }
+            },
+        ));
+
+        $dumped = null;
+        $process = $this->getServerProcess();
+        $process->start(function ($type, $buffer) use ($process, &$dumped, $dumper, $data) {
+            if (Process::ERR === $type) {
+                $process->stop();
+                $this->fail();
+            } elseif ("READY\n" === $buffer) {
+                $dumper->dump($data);
+            } else {
+                $dumped .= $buffer;
+            }
+        });
+
+        $process->wait();
+
+        $this->assertTrue($process->isSuccessful());
+        $this->assertStringMatchesFormat(<<<'DUMP'
+(3) "foo"
+[
+  "timestamp" => %d.%d
+  "foo_provider" => [
+    (3) "foo"
+  ]
+]
+%d
+DUMP
+        , $dumped);
+    }
+
+    private function getServerProcess(): Process
+    {
+        $process = new PhpProcess(file_get_contents(__DIR__.'/../Fixtures/dump_server.php'), null, array(
+            'COMPONENT_ROOT' => __DIR__.'/../../',
+            'VAR_DUMPER_SERVER' => self::VAR_DUMPER_SERVER,
+        ));
+        $process->inheritEnvironmentVariables(true);
+
+        return $process->setTimeout(9);
+    }
+}