diff --git a/core/lib/Drupal/Core/Config/ConfigInstaller.php b/core/lib/Drupal/Core/Config/ConfigInstaller.php index cb4f2e8..a32665e 100644 --- a/core/lib/Drupal/Core/Config/ConfigInstaller.php +++ b/core/lib/Drupal/Core/Config/ConfigInstaller.php @@ -416,7 +416,7 @@ public function checkConfigurationToInstall($type, $name) { // Add the extension that will be enabled to the list of enabled extensions. $enabled_extensions[] = $name; // Gets a profile storage to search for overrides if necessary. - $profile_storage = $this->getProfileStorage($name);; + $profile_storage = $this->getProfileStorage($name); // Check the dependencies of configuration provided by the module. $invalid_default_config = $this->findDefaultConfigWithUnmetDependencies($storage, $enabled_extensions, $profile_storage); diff --git a/core/modules/config/src/Tests/ConfigInstallProfileUnmetDependenciesTest.php b/core/modules/config/src/Tests/ConfigInstallProfileUnmetDependenciesTest.php index 1c82572..e7e8f6c 100644 --- a/core/modules/config/src/Tests/ConfigInstallProfileUnmetDependenciesTest.php +++ b/core/modules/config/src/Tests/ConfigInstallProfileUnmetDependenciesTest.php @@ -27,6 +27,7 @@ class ConfigInstallProfileUnmetDependenciesTest extends InstallerTestBase { /** * Set to TRUE if the expected exception is thrown. + * * @var bool */ protected $expectedException = FALSE; @@ -47,10 +48,14 @@ protected function setUp() { copy($item, $dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName()); } } + + // Add a dependency that can not be met because User is installed before + // Action. $config_file = $dest . DIRECTORY_SEPARATOR . InstallStorage::CONFIG_INSTALL_DIRECTORY . DIRECTORY_SEPARATOR . 'system.action.user_block_user_action.yml'; $action = Yaml::decode(file_get_contents($config_file)); $action['dependencies']['module'][] = 'action'; file_put_contents($config_file, Yaml::encode($action)); + parent::setUp(); }