diff --git a/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php b/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php index 1d26b960d220..fc6f8c9fb155 100644 --- a/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php +++ b/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php @@ -2,7 +2,6 @@ namespace Illuminate\Foundation\Bootstrap; -use Exception; use Illuminate\Config\Repository; use Illuminate\Contracts\Config\Repository as RepositoryContract; use Illuminate\Contracts\Foundation\Application; @@ -62,12 +61,12 @@ protected function loadConfigurationFiles(Application $app, RepositoryContract $ { $files = $this->getConfigurationFiles($app); - // if (! isset($files['app'])) { - // throw new Exception('Unable to load the "app" configuration file.'); - // } - $base = $this->getBaseConfiguration(); + foreach (array_diff(array_keys($base), array_keys($files)) as $name => $config) { + $repository->set($name, $config); + } + foreach ($files as $name => $path) { $base = $this->loadConfigurationFile($repository, $name, $path, $base); }