From 781fcbc654bd3945fb79900d8012743d6412181c Mon Sep 17 00:00:00 2001 From: Niels Date: Tue, 24 Nov 2020 14:00:19 +0100 Subject: [PATCH 1/4] Make DownCommand instance available to prerendered view Having the command instance available to the pre-rendered view gives the possibility to, eg. see if the retry option was set, so you can add a meta-refresh tag to your view. --- src/Illuminate/Foundation/Console/DownCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Foundation/Console/DownCommand.php b/src/Illuminate/Foundation/Console/DownCommand.php index 94c5906531d6..1779ad630cf2 100644 --- a/src/Illuminate/Foundation/Console/DownCommand.php +++ b/src/Illuminate/Foundation/Console/DownCommand.php @@ -100,7 +100,7 @@ protected function prerenderView() { (new RegisterErrorViewPaths)(); - return view($this->option('render'))->render(); + return view($this->option('render'),['command' => $this])->render(); } /** From 8bbbe42052a33d87aae95393d642e5f5e5fe3422 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 24 Nov 2020 14:53:00 +0100 Subject: [PATCH 2/4] Update DownCommand.php --- src/Illuminate/Foundation/Console/DownCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Foundation/Console/DownCommand.php b/src/Illuminate/Foundation/Console/DownCommand.php index 1779ad630cf2..4519fc1b3d81 100644 --- a/src/Illuminate/Foundation/Console/DownCommand.php +++ b/src/Illuminate/Foundation/Console/DownCommand.php @@ -100,7 +100,7 @@ protected function prerenderView() { (new RegisterErrorViewPaths)(); - return view($this->option('render'),['command' => $this])->render(); + return view($this->option('render'), ['command' => $this])->render(); } /** From a0b8812ee35aef3310cc8bf3544a2e8d7bb68a4f Mon Sep 17 00:00:00 2001 From: Niels Date: Wed, 25 Nov 2020 09:19:50 +0100 Subject: [PATCH 3/4] Update DownCommand.php As per Taylor's comment, now only passing along the Down command's options to the pre-rendering view, instead of the entire command instance. --- src/Illuminate/Foundation/Console/DownCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Foundation/Console/DownCommand.php b/src/Illuminate/Foundation/Console/DownCommand.php index 4519fc1b3d81..390039132608 100644 --- a/src/Illuminate/Foundation/Console/DownCommand.php +++ b/src/Illuminate/Foundation/Console/DownCommand.php @@ -100,7 +100,7 @@ protected function prerenderView() { (new RegisterErrorViewPaths)(); - return view($this->option('render'), ['command' => $this])->render(); + return view($this->option('render'), ['options' => $this->options()])->render(); } /** From b1ee97e5ae03dae293e3256b8c3013209d0fd9b0 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 26 Nov 2020 08:35:08 -0600 Subject: [PATCH 4/4] fix view data passing --- src/Illuminate/Foundation/Console/DownCommand.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Illuminate/Foundation/Console/DownCommand.php b/src/Illuminate/Foundation/Console/DownCommand.php index 390039132608..feaf95047078 100644 --- a/src/Illuminate/Foundation/Console/DownCommand.php +++ b/src/Illuminate/Foundation/Console/DownCommand.php @@ -100,7 +100,9 @@ protected function prerenderView() { (new RegisterErrorViewPaths)(); - return view($this->option('render'), ['options' => $this->options()])->render(); + return view($this->option('render'), [ + 'retryAfter' => $this->option('retry'), + ])->render(); } /**