Skip to content
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.

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

[11.x] Fixes config:publish with dontMergeFrameworkConfiguration() set to true #51751

Merged
merged 20 commits into from
Jun 10, 2024

Conversation

crynobone
Copy link
Member

@crynobone crynobone commented Jun 10, 2024

fixes #51736

set to `true`

fixes #51736

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
@crynobone crynobone closed this Jun 10, 2024
crynobone and others added 2 commits June 10, 2024 13:32
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
@crynobone crynobone reopened this Jun 10, 2024
@crynobone crynobone changed the title [11.x] Fixes config:publish with dontMergeFrameworkConfiguration() [11.x] Fixes config:publish with dontMergeFrameworkConfiguration() set to true Jun 10, 2024
crynobone and others added 6 commits June 10, 2024 13:40
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
@crynobone crynobone marked this pull request as ready for review June 10, 2024 06:20
@crynobone crynobone marked this pull request as draft June 10, 2024 06:21
crynobone and others added 7 commits June 10, 2024 14:23
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
@crynobone crynobone marked this pull request as ready for review June 10, 2024 07:07
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
@@ -57,7 +58,7 @@ protected function mergeAdditionalProviders(Application $app)
$app->make('config')->set(
'app.providers',
array_merge(
$app->make('config')->get('app.providers'),
$app->make('config')->get('app.providers') ?? ServiceProvider::defaultProviders()->toArray(),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed scenario where app.php configuration file is not available. Verified with tests below.

@taylorotwell taylorotwell merged commit fecf031 into 11.x Jun 10, 2024
29 checks passed
@taylorotwell taylorotwell deleted the fixes-51736 branch June 10, 2024 15:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Config stub does not match default config file. Causes error when using dontMergeFrameworkConfiguration()
3 participants