[VarDumper] Fix global dump function return value for PHP7

patrickcarlohickman · nicolas-grekas · commit 0def211b9b67 · 2018-09-18T10:05:59.000+02:00
diff --git a/src/Symfony/Component/VarDumper/Resources/functions/dump.php b/src/Symfony/Component/VarDumper/Resources/functions/dump.php
@@ -17,8 +17,8 @@
      */
     function dump($var)
     {
-        foreach (func_get_args() as $var) {
-            VarDumper::dump($var);
+        foreach (func_get_args() as $v) {
+            VarDumper::dump($v);
         }
 
         if (1 < func_num_args()) {
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/FunctionsTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/FunctionsTest.php
@@ -0,0 +1,57 @@
+<?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\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
+use Symfony\Component\VarDumper\VarDumper;
+
+class FunctionsTest extends TestCase
+{
+    public function testDumpReturnsFirstArg()
+    {
+        $this->setupVarDumper();
+
+        $var1 = 'a';
+
+        ob_start();
+        $return = dump($var1);
+        $out = ob_get_clean();
+
+        $this->assertEquals($var1, $return);
+    }
+
+    public function testDumpReturnsAllArgsInArray()
+    {
+        $this->setupVarDumper();
+
+        $var1 = 'a';
+        $var2 = 'b';
+        $var3 = 'c';
+
+        ob_start();
+        $return = dump($var1, $var2, $var3);
+        $out = ob_get_clean();
+
+        $this->assertEquals(array($var1, $var2, $var3), $return);
+    }
+
+    protected function setupVarDumper()
+    {
+        $cloner = new VarCloner();
+        $dumper = new CliDumper('php://output');
+        VarDumper::setHandler(function ($var) use ($cloner, $dumper) {
+            $dumper->dump($cloner->cloneVar($var));
+        });
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`	`*/`
`18`	`18`	`function dump($var)`
`19`	`19`	`{`
`20`		`- foreach (func_get_args() as $var) {`
`21`		`- VarDumper::dump($var);`
	`20`	`+ foreach (func_get_args() as $v) {`
	`21`	`+ VarDumper::dump($v);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`if (1 < func_num_args()) {`