diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index e5d0383..6b6d897 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -151,7 +151,7 @@ function config_get_config_directory($type) { global $config_directories; - // @todo: Remove fallback in Drupal 9. https://www.drupal.org/node/2574943 + // @todo Remove fallback in Drupal 9. https://www.drupal.org/node/2574943 if ($type == CONFIG_SYNC_DIRECTORY && !isset($config_directories[CONFIG_SYNC_DIRECTORY]) && isset($config_directories[CONFIG_STAGING_DIRECTORY])) { $type = CONFIG_STAGING_DIRECTORY; } diff --git a/core/includes/install.inc b/core/includes/install.inc index 9a9a9e6..162d9c9 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -512,10 +512,10 @@ function drupal_install_config_directories() { ))); } - // Put a README.txt into the sync config directory. This is required so - // that they can later be added to git. Since this directory is auto- - // created, we have to write out the README rather than just adding it - // to the drupal core repo. + // Put a README.txt into the sync config directory. This is required so that + // they can later be added to git. Since this directory is auto-created, we + // have to write out the README rather than just adding it to the drupal core + // repo. $text = 'This directory contains configuration to be imported into your Drupal site. To make this configuration active, visit admin/config/development/configuration/sync.' .' For information about deploying configuration between servers, see https://www.drupal.org/documentation/administer/config'; file_put_contents(config_get_config_directory(CONFIG_SYNC_DIRECTORY) . '/README.txt', $text); } diff --git a/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php index b64328c..c7246be 100644 --- a/core/lib/Drupal/Core/Config/ConfigImporter.php +++ b/core/lib/Drupal/Core/Config/ConfigImporter.php @@ -367,8 +367,8 @@ protected function createExtensionChangelist() { $current_extensions = $this->storageComparer->getTargetStorage()->read('core.extension'); $new_extensions = $this->storageComparer->getSourceStorage()->read('core.extension'); - // If there is no extension information in sync then exit. This is - // probably due to an empty sync directory. + // If there is no extension information in sync then exit. This is probably + // due to an empty sync directory. if (!$new_extensions) { return; } diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php index 7de5058..3a9cde4 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php @@ -85,9 +85,9 @@ * configuration object so that they can be checked without the module that * provides the configuration entity class being installed. This is important * for configuration synchronization, which needs to be able to validate - * configuration in the sync directory before the synchronization has - * occurred. Also, if you have a configuration entity object and you want to - * get the current dependencies (without recalculation), you can use + * configuration in the sync directory before the synchronization has occurred. + * Also, if you have a configuration entity object and you want to get the + * current dependencies (without recalculation), you can use * \Drupal\Core\Config\Entity\ConfigEntityInterface::getDependencies(). * * When uninstalling a module or a theme, configuration entities that are diff --git a/core/modules/config/src/Tests/ConfigExportImportUITest.php b/core/modules/config/src/Tests/ConfigExportImportUITest.php index 7700e9b..d72c718 100644 --- a/core/modules/config/src/Tests/ConfigExportImportUITest.php +++ b/core/modules/config/src/Tests/ConfigExportImportUITest.php @@ -198,8 +198,8 @@ public function testExportImport() { $this->assertNoText(t('Warning message')); $this->assertNoText('The following items in your active configuration have changes since the last import that may be lost on the next import.'); $this->assertText(t('There are no configuration changes to import.')); - // Write a file to sync. The warning about differences between the - // active and snapshot should now exist. + // Write a file to sync. The warning about differences between the active + // and snapshot should now exist. /** @var \Drupal\Core\Config\StorageInterface $sync */ $sync = $this->container->get('config.storage.sync'); $data = $this->config('system.site')->get(); diff --git a/core/modules/config/src/Tests/ConfigImportAllTest.php b/core/modules/config/src/Tests/ConfigImportAllTest.php index 932b06b..d496973 100644 --- a/core/modules/config/src/Tests/ConfigImportAllTest.php +++ b/core/modules/config/src/Tests/ConfigImportAllTest.php @@ -70,7 +70,7 @@ public function testInstallUninstall() { $this->assertModuleTablesExist($module); } - // Export active config to sync + // Export active config to sync. $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync')); system_list_reset(); diff --git a/core/modules/config/src/Tests/ConfigImporterMissingContentTest.php b/core/modules/config/src/Tests/ConfigImporterMissingContentTest.php index 695c9da..7990da3 100644 --- a/core/modules/config/src/Tests/ConfigImporterMissingContentTest.php +++ b/core/modules/config/src/Tests/ConfigImporterMissingContentTest.php @@ -75,8 +75,8 @@ protected function setUp() { function testMissingContent() { \Drupal::state()->set('config_import_test.config_import_missing_content', TRUE); - // Update a configuration entity in the sync directory to have a - // dependency on two content entities that do not exist. + // Update a configuration entity in the sync directory to have a dependency + // on two content entities that do not exist. $storage = $this->container->get('config.storage'); $sync = $this->container->get('config.storage.sync'); $entity_one = entity_create('entity_test', array('name' => 'one')); diff --git a/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php b/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php index 7a46a9f..5926afb 100644 --- a/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php +++ b/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php @@ -48,7 +48,7 @@ public function testImport() { $admin_path = 'admin/structure/types/manage/' . $type . '/fields/node.' . $type . '.' . $field_name . '/storage'; - // Export active config to sync + // Export active config to sync. $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync')); // Set the active to not use dots in the allowed values key names.