Fix exceptions handling with aplication option set to false

Kdyby · Sep 21, 2016 · 2451e93 · 2451e93
1 parent b6ab544
commit 2451e93
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Kdyby/Console/Application.php b/src/Kdyby/Console/Application.php
@@ -137,11 +137,12 @@ public function run(InputInterface $input = NULL, OutputInterface $output = NULL
 				Debugger::log($e->getMessage(), Debugger::ERROR);
 				return self::INPUT_ERROR_EXIT_CODE;
 
-			} elseif ($app = $this->serviceLocator->getByType('Nette\Application\Application', FALSE)) {
-				/** @var Nette\Application\Application $app */
-				$app->onError($app, $e);
-
 			} else {
+				if ($app = $this->serviceLocator->getByType('Nette\Application\Application', FALSE)) {
+					/** @var Nette\Application\Application $app */
+					$app->onError($app, $e);
+				}
+
 				$this->handleException($e, $output);
 			}
 

diff --git a/src/Kdyby/Console/DI/ConsoleExtension.php b/src/Kdyby/Console/DI/ConsoleExtension.php
@@ -188,8 +188,7 @@ protected function beforeCompileHookApplication(array $config)
 				->addSetup('$self = $this; $service->onError[] = function ($app, $e) use ($self) {' . "\n" .
 					"\t" . '$app->errorPresenter = ?;' . "\n" .
 					"\t" . '$app->onShutdown[] = function () { exit(?); };' . "\n" .
-					"\t" . '$self->getService(?)->handleException($e); ' . "\n" .
-					'}', [FALSE, 254, $this->prefix('application')]);
+					'}', [FALSE, 254]);
 		}
 
 		$routerServiceName = $builder->getByType('Nette\Application\IRouter') ?: 'router';