From 07d318ab00667663d4fa311483688d2e398d955a Mon Sep 17 00:00:00 2001
From: HypeMC <hypemc@gmail.com>
Date: Tue, 23 May 2023 18:31:18 +0200
Subject: [PATCH] [VarDumper] Fix `dd()` showing line with `null`

---
 .../VarDumper/Resources/functions/dump.php      |  2 +-
 .../Dumper/functions/dd_with_multiple_args.phpt | 17 +++++++++++++++++
 .../Tests/Dumper/functions/dd_with_null.phpt    | 15 +++++++++++++++
 .../Dumper/functions/dd_with_single_arg.phpt    | 15 +++++++++++++++
 .../functions/dump_with_multiple_args.phpt      | 17 +++++++++++++++++
 .../Tests/Dumper/functions/dump_with_null.phpt  | 15 +++++++++++++++
 .../Dumper/functions/dump_with_single_arg.phpt  | 15 +++++++++++++++
 .../Component/VarDumper/phpunit.xml.dist        |  1 +
 8 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_multiple_args.phpt
 create mode 100644 src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_null.phpt
 create mode 100644 src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_single_arg.phpt
 create mode 100644 src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_multiple_args.phpt
 create mode 100644 src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_null.phpt
 create mode 100644 src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_single_arg.phpt

diff --git a/src/Symfony/Component/VarDumper/Resources/functions/dump.php b/src/Symfony/Component/VarDumper/Resources/functions/dump.php
index d933bb7b10f62..a0e5addff1094 100644
--- a/src/Symfony/Component/VarDumper/Resources/functions/dump.php
+++ b/src/Symfony/Component/VarDumper/Resources/functions/dump.php
@@ -49,7 +49,7 @@ function dd(mixed ...$vars): never
             header('HTTP/1.1 500 Internal Server Error');
         }
 
-        if (isset($vars[0]) && 1 === count($vars)) {
+        if (array_key_exists(0, $vars) && 1 === count($vars)) {
             VarDumper::dump($vars[0]);
         } else {
             foreach ($vars as $k => $v) {
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_multiple_args.phpt b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_multiple_args.phpt
new file mode 100644
index 0000000000000..cca00c3fed1c1
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_multiple_args.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Test dd() with multiple args shows line number
+--FILE--
+<?php
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+dd(null, 1, 'foo');
+
+--EXPECT--
+1 null
+2 1
+3 "foo"
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_null.phpt b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_null.phpt
new file mode 100644
index 0000000000000..23fed4472b879
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_null.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test dd() with null doesn't show line number
+--FILE--
+<?php
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+dd(null);
+
+--EXPECT--
+null
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_single_arg.phpt b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_single_arg.phpt
new file mode 100644
index 0000000000000..0d4b134b5101e
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dd_with_single_arg.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test dd() with one arg doesn't show line number
+--FILE--
+<?php
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+dd('foo');
+
+--EXPECT--
+"foo"
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_multiple_args.phpt b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_multiple_args.phpt
new file mode 100644
index 0000000000000..17b409ce4215c
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_multiple_args.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Test dump() with multiple args shows line number
+--FILE--
+<?php
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+dump(null, 1, 'foo');
+
+--EXPECT--
+1 null
+2 1
+3 "foo"
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_null.phpt b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_null.phpt
new file mode 100644
index 0000000000000..ad296c31dbf5a
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_null.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test dump() with null doesn't show line number
+--FILE--
+<?php
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+dump(null);
+
+--EXPECT--
+null
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_single_arg.phpt b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_single_arg.phpt
new file mode 100644
index 0000000000000..c87343717500d
--- /dev/null
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/functions/dump_with_single_arg.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test dump() with one arg doesn't show line number
+--FILE--
+<?php
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+dump('foo');
+
+--EXPECT--
+"foo"
diff --git a/src/Symfony/Component/VarDumper/phpunit.xml.dist b/src/Symfony/Component/VarDumper/phpunit.xml.dist
index 61727f16f6eeb..a629967b7baa2 100644
--- a/src/Symfony/Component/VarDumper/phpunit.xml.dist
+++ b/src/Symfony/Component/VarDumper/phpunit.xml.dist
@@ -17,6 +17,7 @@
     <testsuites>
         <testsuite name="Symfony VarDumper Component Test Suite">
             <directory>./Tests/</directory>
+            <directory suffix=".phpt">./Tests/Dumper/functions/</directory>
         </testsuite>
     </testsuites>