Skip to content

Commit 8fcaded

Browse files
committed
Correct how base options for missing config files are preloaded
1 parent b99bdf8 commit 8fcaded

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Illuminate\Config\Repository;
66
use Illuminate\Contracts\Config\Repository as RepositoryContract;
77
use Illuminate\Contracts\Foundation\Application;
8+
use Illuminate\Support\Collection;
89
use SplFileInfo;
910
use Symfony\Component\Finder\Finder;
1011

@@ -69,7 +70,7 @@ protected function loadConfigurationFiles(Application $app, RepositoryContract $
6970
? $this->getBaseConfiguration()
7071
: [];
7172

72-
foreach (array_diff(array_keys($base), array_keys($files)) as $name => $config) {
73+
foreach (Collection::make($base)->diffKeys($files) as $name => $config) {
7374
$repository->set($name, $config);
7475
}
7576

0 commit comments

Comments
 (0)