10000 [11.x] Preload base options for missing config files by jasonmccreary · Pull Request #51619 · laravel/framework · GitHub
[go: up one dir, main page]
Skip to content

[11.x] Preload base options for missing config files #51619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 30, 2024
Merged

[11.x] Preload base options for missing config files #51619

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b26c43
Remove dead code
jasonmccreary May 29, 2024
15a338f
Preload base options for missing config files
jasonmccreary May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Preload base options for missing config files
  • Loading branch information
@jasonmccreary
jasonmccreary committed May 29, 2024
commit 15a338f42eebaa9c09c1745cd526feaa1bcb1e41
4 changes: 4 additions & 0 deletions src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ protected function loadConfigurationFiles(Application $app, RepositoryContract $

$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);
}
Expand Down
0