Skip to content

Commit ffad5c7

Browse files
dcblogdevdcblogdev
authored
Merge pull request #2059 from nWidart/hot-fixes-for-mismatch-variables
Hot fixes for mismatch variables
2 parents e25033c + b80e2c2 commit ffad5c7

12 files changed

+24
-24
lines changed

‎src/Commands/stubs/scaffold/provider.stub

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class $CLASS$ extends ServiceProvider
9999

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

102-
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
102+
$this->publishes([$file->getPathname() => config_path($config)], 'config');
103103
$this->merge_config_from($file->getPathname(), $key);
104104
}
105105
}
@@ -129,7 +129,7 @@ class $CLASS$ extends ServiceProvider
129129

130130
$this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->nameLower);
131131

132-
Blade::componentNamespace(config('modules.namespace').'\\' . $this->moduleName . '\\View\\Components', $this->moduleNameLower);
132+
Blade::componentNamespace(config('modules.namespace').'\\' . $this->name . '\\View\\Components', $this->nameLower);
133133
}
134134

135135
/**

‎tests/Commands/Make/__snapshots__/ModuleMakeCommandTest__test_it_generate_module_when_provider_is_enable_and_route_provider_is_disable__1.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class BlogServiceProvider extends ServiceProvider
9999

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

102-
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
102+
$this->publishes([$file->getPathname() => config_path($config)], 'config');
103103
$this->merge_config_from($file->getPathname(), $key);
104104
}
105105
}
@@ -129,7 +129,7 @@ class BlogServiceProvider extends ServiceProvider
129129

130130
$this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->nameLower);
131131

132-
Blade::componentNamespace(config('modules.namespace').'\\' . $this->moduleName . '\\View\\Components', $this->moduleNameLower);
132+
Blade::componentNamespace(config('modules.namespace').'\\' . $this->name . '\\View\\Components', $this->nameLower);
133133
}
134134

135135
/**

‎tests/Commands/Make/__snapshots__/ModuleMakeCommandTest__test_it_generate_module_when_provider_is_enable_and_route_provider_is_enable__1.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class BlogServiceProvider extends ServiceProvider
9999

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

102-
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
102+
$this->publishes([$file->getPathname() => config_path($config)], 'config');
103103
$this->merge_config_from($file->getPathname(), $key);
104104
}
105105
}
@@ -129,7 +129,7 @@ class BlogServiceProvider extends ServiceProvider
129129

130130
$this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->nameLower);
131131

132-
Blade::componentNamespace(config('modules.namespace').'\\' . $this->moduleName . '\\View\\Components', $this->moduleNameLower);
132+
Blade::componentNamespace(config('modules.namespace').'\\' . $this->name . '\\View\\Components', $this->nameLower);
133133
}
134134

135135
/**

‎tests/Commands/Make/__snapshots__/ModuleMakeCommandTest__test_it_generates_api_module_with_resources__1.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class BlogServiceProvider extends ServiceProvider
9999

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

102-
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
102+
$this->publishes([$file->getPathname() => config_path($config)], 'config');
103103
$this->merge_config_from($file->getPathname(), $key);
104104
}
105105
}
@@ -129,7 +129,7 @@ class BlogServiceProvider extends ServiceProvider
129129

130130
$this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->nameLower);
131131

132-
Blade::componentNamespace(config('modules.namespace').'\\' . $this->moduleName . '\\View\\Components', $this->moduleNameLower);
132+
Blade::componentNamespace(config('modules.namespace').'\\' . $this->name . '\\View\\Components', $this->nameLower);
133133
}
134134

135135
/**

‎tests/Commands/Make/__snapshots__/ModuleMakeCommandTest__test_it_generates_module_namespace_using_studly_case__1.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class ModuleNameServiceProvider extends ServiceProvider
9999

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

102-
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
102+
$this->publishes([$file->getPathname() => config_path($config)], 'config');
103103
$this->merge_config_from($file->getPathname(), $key);
104104
}
105105
}
@@ -129,7 +129,7 @@ class ModuleNameServiceProvider extends ServiceProvider
129129

130130
$this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->nameLower);
131131

132-
Blade::componentNamespace(config('modules.namespace').'\\' . $this->moduleName . '\\View\\Components', $this->moduleNameLower);
132+
Blade::componentNamespace(config('modules.namespace').'\\' . $this->name . '\\View\\Components', $this->nameLower);
133133
}
134134

135135
/**

‎tests/Commands/Make/__snapshots__/ModuleMakeCommandTest__test_it_generates_module_resources__1.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class BlogServiceProvider extends ServiceProvider
9999

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

102-
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
102+
$this->publishes([$file->getPathname() => config_path($config)], 'config');
103103
$this->merge_config_from($file->getPathname(), $key);
104104
}
105105
}
@@ -129,7 +129,7 @@ class BlogServiceProvider extends ServiceProvider
129129

130130
$this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->nameLower);
131131

132-
Blade::componentNamespace(config('modules.namespace').'\\' . $this->moduleName . '\\View\\Components', $this->moduleNameLower);
132+
Blade::componentNamespace(config('modules.namespace').'\\' . $this->name . '\\View\\Components', $this->nameLower);
133133
}
134134

135135
/**

‎tests/Commands/Make/__snapshots__/ModuleMakeCommandTest__test_it_generates_web_module_with_resources__1.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class BlogServiceProvider extends ServiceProvider
9999

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

102-
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
102+
$this->publishes([$file->getPathname() => config_path($config)], 'config');
103103
$this->merge_config_from($file->getPathname(), $key);
104104
}
105105
}
@@ -129,7 +129,7 @@ class BlogServiceProvider extends ServiceProvider
129129

130130
$this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->nameLower);
131131

132-
Blade::componentNamespace(config('modules.namespace').'\\' . $this->moduleName . '\\View\\Components', $this->moduleNameLower);
132+
Blade::componentNamespace(config('modules.namespace').'\\' . $this->name . '\\View\\Components', $this->nameLower);
133133
}
134134

135135
/**

‎tests/Commands/Make/__snapshots__/ModuleMakeCommandTest__test_it_generates_web_module_with_resources_when_adding_more_than_one_option__1.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class BlogServiceProvider extends ServiceProvider
9999

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

102-
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
102+
$this->publishes([$file->getPathname() => config_path($config)], 'config');
103103
$this->merge_config_from($file->getPathname(), $key);
104104
}
105105
}
@@ -129,7 +129,7 @@ class BlogServiceProvider extends ServiceProvider
129129

130130
$this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->nameLower);
131131

132-
Blade::componentNamespace(config('modules.namespace').'\\' . $this->moduleName . '\\View\\Components', $this->moduleNameLower);
132+
Blade::componentNamespace(config('modules.namespace').'\\' . $this->name . '\\View\\Components', $this->nameLower);
133133
}
134134

135135
/**

‎tests/Commands/Make/__snapshots__/ProviderMakeCommandTest__test_it_can_change_the_default_namespace__1.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class BlogServiceProvider extends ServiceProvider
9999

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

102-
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
102+
$this->publishes([$file->getPathname() => config_path($config)], 'config');
103103
$this->merge_config_from($file->getPathname(), $key);
104104
}
105105
}
@@ -129,7 +129,7 @@ class BlogServiceProvider extends ServiceProvider
129129

130130
$this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->nameLower);
131131

132-
Blade::componentNamespace(config('modules.namespace').'\\' . $this->moduleName . '\\View\\Components', $this->moduleNameLower);
132+
Blade::componentNamespace(config('modules.namespace').'\\' . $this->name . '\\View\\Components', $this->nameLower);
133133
}
134134

135135
/**

‎tests/Commands/Make/__snapshots__/ProviderMakeCommandTest__test_it_can_change_the_default_namespace_specific__1.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class BlogServiceProvider extends ServiceProvider
9999

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

102-
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
102+
$this->publishes([$file->getPathname() => config_path($config)], 'config');
103103
$this->merge_config_from($file->getPathname(), $key);
104104
}
105105
}
@@ -129,7 +129,7 @@ class BlogServiceProvider extends ServiceProvider
129129

130130
$this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->nameLower);
131131

132-
Blade::componentNamespace(config('modules.namespace').'\\' . $this->moduleName . '\\View\\Components', $this->moduleNameLower);
132+
Blade::componentNamespace(config('modules.namespace').'\\' . $this->name . '\\View\\Components', $this->nameLower);
133133
}
134134

135135
/**

‎tests/Commands/Make/__snapshots__/ProviderMakeCommandTest__test_it_can_have_custom_migration_resources_location_paths__1.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class BlogServiceProvider extends ServiceProvider
9999

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

102-
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
102+
$this->publishes([$file->getPathname() => config_path($config)], 'config');
103103
$this->merge_config_from($file->getPathname(), $key);
104104
}
105105
}
@@ -129,7 +129,7 @@ class BlogServiceProvider extends ServiceProvider
129129

130130
$this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->nameLower);
131131

132-
Blade::componentNamespace(config('modules.namespace').'\\' . $this->moduleName . '\\View\\Components', $this->moduleNameLower);
132+
Blade::componentNamespace(config('modules.namespace').'\\' . $this->name . '\\View\\Components', $this->nameLower);
133133
}
134134

135135
/**

‎tests/Commands/Make/__snapshots__/ProviderMakeCommandTest__test_it_generates_a_master_service_provider_with_resource_loading__1.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class BlogServiceProvider extends ServiceProvider
9999

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

102-
$this->publishes([$file->getPathname() => config_path($relativePath)], 'config');
102+
$this->publishes([$file->getPathname() => config_path($config)], 'config');
103103
$this->merge_config_from($file->getPathname(), $key);
104104
}
105105
}
@@ -129,7 +129,7 @@ class BlogServiceProvider extends ServiceProvider
129129

130130
$this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->nameLower);
131131

132-
Blade::componentNamespace(config('modules.namespace').'\\' . $this->moduleName . '\\View\\Components', $this->moduleNameLower);
132+
Blade::componentNamespace(config('modules.namespace').'\\' . $this->name . '\\View\\Components', $this->nameLower);
133133
}
134134

135135
/**

0 commit comments

Comments
 (0)