diff --git a/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php b/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php index 73e517153383..19aefbc170f9 100644 --- a/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php +++ b/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php @@ -59,6 +59,12 @@ public function bootstrap(Application $app) */ protected function loadConfigurationFiles(Application $app, RepositoryContract $repository) { + $files = $this->getConfigurationFiles($app); + + if (! isset($files['app'])) { + throw new \Exception('Unable to load the config/app.php file.'); + } + foreach ($this->getConfigurationFiles($app) as $key => $path) { $repository->set($key, require $path); } diff --git a/src/Illuminate/Foundation/Exceptions/Handler.php b/src/Illuminate/Foundation/Exceptions/Handler.php index da6011c0359a..f8da3961e08a 100644 --- a/src/Illuminate/Foundation/Exceptions/Handler.php +++ b/src/Illuminate/Foundation/Exceptions/Handler.php @@ -208,7 +208,7 @@ protected function convertExceptionToResponse(Exception $e) { $e = FlattenException::create($e); - $handler = new SymfonyExceptionHandler(config('app.debug')); + $handler = new SymfonyExceptionHandler(config('app.debug', true)); return SymfonyResponse::create($handler->getHtml($e), $e->getStatusCode(), $e->getHeaders()); } diff --git a/src/Illuminate/Log/LogServiceProvider.php b/src/Illuminate/Log/LogServiceProvider.php index 065eaae28add..a927dbf98901 100644 --- a/src/Illuminate/Log/LogServiceProvider.php +++ b/src/Illuminate/Log/LogServiceProvider.php @@ -118,7 +118,7 @@ protected function configureErrorlogHandler(Writer $log) protected function handler() { if ($this->app->bound('config')) { - return $this->app->make('config')->get('app.log'); + return $this->app->make('config')->get('app.log', 'single'); } return 'single';