From a06132cf639a91d106bab0b8693debfa0a42d815 Mon Sep 17 00:00:00 2001 From: Jess Julian Nielsen Date: Tue, 17 Dec 2019 15:28:56 +0100 Subject: [PATCH 1/2] Added previous exception to EntryNotFoundException thrown in Container.php (#30862) --- src/Illuminate/Container/Container.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php index 1a7784d34aa6..b595b5c9230c 100755 --- a/src/Illuminate/Container/Container.php +++ b/src/Illuminate/Container/Container.php @@ -641,7 +641,7 @@ public function get($id) throw $e; } - throw new EntryNotFoundException($id); + throw new EntryNotFoundException($id, $e->getCode(), $e); } } From a849b2c0280faccd27392c34556f37052fd5877e Mon Sep 17 00:00:00 2001 From: Paul-Henri Leobon <25308170+paulhenri-l@users.noreply.github.com> Date: Tue, 17 Dec 2019 15:37:51 +0100 Subject: [PATCH 2/2] [6.x] Allow force creation of controllers (#30856) * Allow force and alphabetically reorder options * Typo --- src/Illuminate/Routing/Console/ControllerMakeCommand.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Illuminate/Routing/Console/ControllerMakeCommand.php b/src/Illuminate/Routing/Console/ControllerMakeCommand.php index a02a61d1c913..258ec5dd384c 100755 --- a/src/Illuminate/Routing/Console/ControllerMakeCommand.php +++ b/src/Illuminate/Routing/Console/ControllerMakeCommand.php @@ -176,11 +176,12 @@ protected function parseModel($model) protected function getOptions() { return [ - ['model', 'm', InputOption::VALUE_OPTIONAL, 'Generate a resource controller for the given model.'], - ['resource', 'r', InputOption::VALUE_NONE, 'Generate a resource controller class.'], + ['api', null, InputOption::VALUE_NONE, 'Exclude the create and edit methods from the controller.'], + ['force', null, InputOption::VALUE_NONE, 'Create the class even if the controller already exists'], ['invokable', 'i', InputOption::VALUE_NONE, 'Generate a single method, invokable controller class.'], + ['model', 'm', InputOption::VALUE_OPTIONAL, 'Generate a resource controller for the given model.'], ['parent', 'p', InputOption::VALUE_OPTIONAL, 'Generate a nested resource controller class.'], - ['api', null, InputOption::VALUE_NONE, 'Exclude the create and edit methods from the controller.'], + ['resource', 'r', InputOption::VALUE_NONE, 'Generate a resource controller class.'], ]; } }