From b4c375c0300d98702b364039823a36535a525c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20Kru=CC=88ss?= Date: Sat, 4 Aug 2018 13:16:48 -0700 Subject: [PATCH 1/2] =?UTF-8?q?use=20Symfony=E2=80=99s=20dd()=20helper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Illuminate/Support/Collection.php | 4 +-- src/Illuminate/Support/Debug/Dumper.php | 26 ------------------ src/Illuminate/Support/Debug/HtmlDumper.php | 29 --------------------- src/Illuminate/Support/helpers.php | 18 ------------- 4 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 src/Illuminate/Support/Debug/Dumper.php delete mode 100644 src/Illuminate/Support/Debug/HtmlDumper.php diff --git a/src/Illuminate/Support/Collection.php b/src/Illuminate/Support/Collection.php index 50dc627d32c5..5c9e6e05eb68 100644 --- a/src/Illuminate/Support/Collection.php +++ b/src/Illuminate/Support/Collection.php @@ -11,8 +11,8 @@ use CachingIterator; use JsonSerializable; use IteratorAggregate; -use Illuminate\Support\Debug\Dumper; use Illuminate\Support\Traits\Macroable; +use Symfony\Component\VarDumper\VarDumper; use Illuminate\Contracts\Support\Jsonable; use Illuminate\Contracts\Support\Arrayable; @@ -320,7 +320,7 @@ public function dump() (new static(func_get_args())) ->push($this) ->each(function ($item) { - (new Dumper)->dump($item); + VarDumper::dump($item); }); return $this; diff --git a/src/Illuminate/Support/Debug/Dumper.php b/src/Illuminate/Support/Debug/Dumper.php deleted file mode 100644 index 7442343f8097..000000000000 --- a/src/Illuminate/Support/Debug/Dumper.php +++ /dev/null @@ -1,26 +0,0 @@ -dump((new VarCloner)->cloneVar($value)); - } else { - var_dump($value); - } - } -} diff --git a/src/Illuminate/Support/Debug/HtmlDumper.php b/src/Illuminate/Support/Debug/HtmlDumper.php deleted file mode 100644 index 5825ac8dba7c..000000000000 --- a/src/Illuminate/Support/Debug/HtmlDumper.php +++ /dev/null @@ -1,29 +0,0 @@ - 'background-color:#fff; color:#222; line-height:1.2em; font-weight:normal; font:12px Monaco, Consolas, monospace; word-wrap: break-word; white-space: pre-wrap; position:relative; z-index:100000', - 'num' => 'color:#a71d5d', - 'const' => 'color:#795da3', - 'str' => 'color:#df5000', - 'cchr' => 'color:#222', - 'note' => 'color:#a71d5d', - 'ref' => 'color:#a0a0a0', - 'public' => 'color:#795da3', - 'protected' => 'color:#795da3', - 'private' => 'color:#795da3', - 'meta' => 'color:#b729d9', - 'key' => 'color:#df5000', - 'index' => 'color:#a71d5d', - ]; -} diff --git a/src/Illuminate/Support/helpers.php b/src/Illuminate/Support/helpers.php index 0fb3e75f84b4..6f28c148946e 100755 --- a/src/Illuminate/Support/helpers.php +++ b/src/Illuminate/Support/helpers.php @@ -4,7 +4,6 @@ use Illuminate\Support\Str; use Illuminate\Support\Optional; use Illuminate\Support\Collection; -use Illuminate\Support\Debug\Dumper; use Illuminate\Contracts\Support\Htmlable; use Illuminate\Support\HigherOrderTapProxy; @@ -544,23 +543,6 @@ function data_set(&$target, $key, $value, $overwrite = true) } } -if (! function_exists('dd')) { - /** - * Dump the passed variables and end the script. - * - * @param mixed $args - * @return void - */ - function dd(...$args) - { - foreach ($args as $x) { - (new Dumper)->dump($x); - } - - die(1); - } -} - if (! function_exists('e')) { /** * Escape HTML special characters in a string. From e72112d31d404e64aed130791616f8f85646c959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20Kr=C3=BCss?= Date: Sat, 4 Aug 2018 13:20:47 -0700 Subject: [PATCH 2/2] satisfy StyleCI --- src/Illuminate/Support/Collection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Support/Collection.php b/src/Illuminate/Support/Collection.php index 5c9e6e05eb68..c3b2fbd93a79 100644 --- a/src/Illuminate/Support/Collection.php +++ b/src/Illuminate/Support/Collection.php @@ -12,8 +12,8 @@ use JsonSerializable; use IteratorAggregate; use Illuminate\Support\Traits\Macroable; -use Symfony\Component\VarDumper\VarDumper; use Illuminate\Contracts\Support\Jsonable; +use Symfony\Component\VarDumper\VarDumper; use Illuminate\Contracts\Support\Arrayable; /**