Skip to content

Allow Module Configs to Override Root Application Configs #2053

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 3 commits into from
Apr 28, 2025
Merged

Allow Module Configs to Override Root Application Configs #2053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5459253
Enable Module Configs to Override Root App Configs
solomon-ochepa Apr 21, 2025
3a17705
Update test snapshots
solomon-ochepa Apr 21, 2025
ca06cde
Merge branch 'master' into feature/module-config-override
dcblogdev Apr 28, 2025
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
15 changes: 13 additions & 2 deletions src/Commands/stubs/scaffold/provider.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,24 @@ class $CLASS$ extends ServiceProvider

$key = ($config === 'config.php') ? $this->nameLower : implode('.', $normalized);

$this->publishes([$file->getPathname() => config_path($config)], 'config');
$this->mergeConfigFrom($file->getPathname(), $key);
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
$this->merge_config_from($file->getPathname(), $key);
}
}
}
}

/**
* Merge config from the given path recursively.
*/
protected function merge_config_from(string $path, string $key): void
{
$existing = config($key, []);
$module_config = require $path;

config([$key => array_replace_recursive($existing, $module_config)]);
}

/**
* Register views.
*/
Expand Down
15 changes: 13 additions & 2 deletions ...est__test_it_generate_module_when_provider_is_enable_and_route_provider_is_disable__1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,24 @@ class BlogServiceProvider extends ServiceProvider

$key = ($config === 'config.php') ? $this->nameLower : implode('.', $normalized);

$this->publishes([$file->getPathname() => config_path($config)], 'config');
$this->mergeConfigFrom($file->getPathname(), $key);
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
$this->merge_config_from($file->getPathname(), $key);
}
}
}
}

/**
* Merge config from the given path recursively.
*/
protected function merge_config_from(string $path, string $key): void
{
$existing = config($key, []);
$module_config = require $path;

config([$key => array_replace_recursive($existing, $module_config)]);
}

/**
* Register views.
*/
Expand Down
15 changes: 13 additions & 2 deletions ...Test__test_it_generate_module_when_provider_is_enable_and_route_provider_is_enable__1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,24 @@ class BlogServiceProvider extends ServiceProvider

$key = ($config === 'config.php') ? $this->nameLower : implode('.', $normalized);

$this->publishes([$file->getPathname() => config_path($config)], 'config');
$this->mergeConfigFrom($file->getPathname(), $key);
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
$this->merge_config_from($file->getPathname(), $key);
}
}
}
}

/**
* Merge config from the given path recursively.
*/
protected function merge_config_from(string $path, string $key): void
{
$existing = config($key, []);
$module_config = require $path;

config([$key => array_replace_recursive($existing, $module_config)]);
}

/**
* Register views.
*/
Expand Down
15 changes: 13 additions & 2 deletions ...e/__snapshots__/ModuleMakeCommandTest__test_it_generates_api_module_with_resources__1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,24 @@ class BlogServiceProvider extends ServiceProvider

$key = ($config === 'config.php') ? $this->nameLower : implode('.', $normalized);

$this->publishes([$file->getPathname() => config_path($config)], 'config');
$this->mergeConfigFrom($file->getPathname(), $key);
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
$this->merge_config_from($file->getPathname(), $key);
}
}
}
}

/**
* Merge config from the given path recursively.
*/
protected function merge_config_from(string $path, string $key): void
{
$existing = config($key, []);
$module_config = require $path;

config([$key => array_replace_recursive($existing, $module_config)]);
}

/**
* Register views.
*/
Expand Down
15 changes: 13 additions & 2 deletions ...hots__/ModuleMakeCommandTest__test_it_generates_module_namespace_using_studly_case__1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,24 @@ class ModuleNameServiceProvider extends ServiceProvider

$key = ($config === 'config.php') ? $this->nameLower : implode('.', $normalized);

$this->publishes([$file->getPathname() => config_path($config)], 'config');
$this->mergeConfigFrom($file->getPathname(), $key);
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
$this->merge_config_from($file->getPathname(), $key);
}
}
}
}

/**
* Merge config from the given path recursively.
*/
protected function merge_config_from(string $path, string $key): void
{
$existing = config($key, []);
$module_config = require $path;

config([$key => array_replace_recursive($existing, $module_config)]);
}

/**
* Register views.
*/
Expand Down
15 changes: 13 additions & 2 deletions ...mands/Make/__snapshots__/ModuleMakeCommandTest__test_it_generates_module_resources__1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,24 @@ class BlogServiceProvider extends ServiceProvider

$key = ($config === 'config.php') ? $this->nameLower : implode('.', $normalized);

$this->publishes([$file->getPathname() => config_path($config)], 'config');
$this->mergeConfigFrom($file->getPathname(), $key);
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
$this->merge_config_from($file->getPathname(), $key);
}
}
}
}

/**
* Merge config from the given path recursively.
*/
protected function merge_config_from(string $path, string $key): void
{
$existing = config($key, []);
$module_config = require $path;

config([$key => array_replace_recursive($existing, $module_config)]);
}

/**
* Register views.
*/
Expand Down
15 changes: 13 additions & 2 deletions ...e/__snapshots__/ModuleMakeCommandTest__test_it_generates_web_module_with_resources__1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,24 @@ class BlogServiceProvider extends ServiceProvider

$key = ($config === 'config.php') ? $this->nameLower : implode('.', $normalized);

$this->publishes([$file->getPathname() => config_path($config)], 'config');
$this->mergeConfigFrom($file->getPathname(), $key);
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
$this->merge_config_from($file->getPathname(), $key);
}
}
}
}

/**
* Merge config from the given path recursively.
*/
protected function merge_config_from(string $path, string $key): void
{
$existing = config($key, []);
$module_config = require $path;

config([$key => array_replace_recursive($existing, $module_config)]);
}

/**
* Register views.
*/
Expand Down
15 changes: 13 additions & 2 deletions ...Test__test_it_generates_web_module_with_resources_when_adding_more_than_one_option__1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,24 @@ class BlogServiceProvider extends ServiceProvider

$key = ($config === 'config.php') ? $this->nameLower : implode('.', $normalized);

$this->publishes([$file->getPathname() => config_path($config)], 'config');
$this->mergeConfigFrom($file->getPathname(), $key);
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
$this->merge_config_from($file->getPathname(), $key);
}
}
}
}

/**
* Merge config from the given path recursively.
*/
protected function merge_config_from(string $path, string $key): void
{
$existing = config($key, []);
$module_config = require $path;

config([$key => array_replace_recursive($existing, $module_config)]);
}

/**
* Register views.
*/
Expand Down
15 changes: 13 additions & 2 deletions ...ke/__snapshots__/ProviderMakeCommandTest__test_it_can_change_the_default_namespace__1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,24 @@ class BlogServiceProvider extends ServiceProvider

$key = ($config === 'config.php') ? $this->nameLower : implode('.', $normalized);

$this->publishes([$file->getPathname() => config_path($config)], 'config');
$this->mergeConfigFrom($file->getPathname(), $key);
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
$this->merge_config_from($file->getPathname(), $key);
}
}
}
}

/**
* Merge config from the given path recursively.
*/
protected function merge_config_from(string $path, string $key): void
{
$existing = config($key, []);
$module_config = require $path;

config([$key => array_replace_recursive($existing, $module_config)]);
}

/**
* Register views.
*/
Expand Down
16 changes: 13 additions & 3 deletions ...shots__/ProviderMakeCommandTest__test_it_can_change_the_default_namespace_specific__1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ class BlogServiceProvider extends ServiceProvider
$config = str_replace($configPath.DIRECTORY_SEPARATOR, '', $file->getPathname());
$config_key = str_replace([DIRECTORY_SEPARATOR, '.php'], ['.', ''], $config);
$segments = explode('.', $this->nameLower.'.'.$config_key);

// Remove duplicated adjacent segments
$normalized = [];
foreach ($segments as $segment) {
Expand All @@ -99,13 +98,24 @@ class BlogServiceProvider extends ServiceProvider

$key = ($config === 'config.php') ? $this->nameLower : implode('.', $normalized);

$this->publishes([$file->getPathname() => config_path($config)], 'config');
$this->mergeConfigFrom($file->getPathname(), $key);
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
$this->merge_config_from($file->getPathname(), $key);
}
}
}
}

/**
* Merge config from the given path recursively.
*/
protected function merge_config_from(string $path, string $key): void
{
$existing = config($key, []);
$module_config = require $path;

config([$key => array_replace_recursive($existing, $module_config)]);
}

/**
* Register views.
*/
Expand Down
15 changes: 13 additions & 2 deletions ...roviderMakeCommandTest__test_it_can_have_custom_migration_resources_location_paths__1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,24 @@ class BlogServiceProvider extends ServiceProvider

$key = ($config === 'config.php') ? $this->nameLower : implode('.', $normalized);

$this->publishes([$file->getPathname() => config_path($config)], 'config');
$this->mergeConfigFrom($file->getPathname(), $key);
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
$this->merge_config_from($file->getPathname(), $key);
}
}
}
}

/**
* Merge config from the given path recursively.
*/
protected function merge_config_from(string $path, string $key): void
{
$existing = config($key, []);
$module_config = require $path;

config([$key => array_replace_recursive($existing, $module_config)]);
}

/**
* Register views.
*/
Expand Down
15 changes: 13 additions & 2 deletions ...MakeCommandTest__test_it_generates_a_master_service_provider_with_resource_loading__1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,24 @@ class BlogServiceProvider extends ServiceProvider

$key = ($config === 'config.php') ? $this->nameLower : implode('.', $normalized);

$this->publishes([$file->getPathname() => config_path($config)], 'config');
$this->mergeConfigFrom($file->getPathname(), $key);
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
$this->merge_config_from($file->getPathname(), $key);
}
}
}
}

/**
* Merge config from the given path recursively.
*/
protected function merge_config_from(string $path, string $key): void
{
$existing = config($key, []);
$module_config = require $path;

config([$key => array_replace_recursive($existing, $module_config)]);
}

/**
* Register views.
*/
Expand Down
Loading