diff --git a/core/lib/Drupal/Core/Config/ConfigManagerInterface.php b/core/lib/Drupal/Core/Config/ConfigManagerInterface.php index a9907f4..075dfa9 100644 --- a/core/lib/Drupal/Core/Config/ConfigManagerInterface.php +++ b/core/lib/Drupal/Core/Config/ConfigManagerInterface.php @@ -146,7 +146,7 @@ public function findConfigEntityDependentsAsEntities($type, array $names); * should be a list of module names or theme names. In the case of 'config' * or 'content' it should be a list of configuration dependency names. * @param bool $dry_run - * If set to FALSE the entities returned in the list of updates will + * If set to FALSE the entities returned in the list of updates will be * modified. In order to make the changes the caller needs to save them. If * set to TRUE the entities returned will not be modified. * @@ -155,7 +155,7 @@ public function findConfigEntityDependentsAsEntities($type, array $names); * each is a list of configuration entities that need to have that action * applied when the supplied dependencies are removed. Updates need to be * processed before deletes. The order of the deletes is significant and - * must be processed in the order. + * must be processed in the returned order. */ public function getConfigEntitiesToChangeOnDependencyRemoval($type, array $names, $dry_run = TRUE); diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php index df5a1d5..ce053e1 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php @@ -296,7 +296,7 @@ public function setData(array $data) { * * @return $this */ - public function updateData($name, $dependencies) { + public function updateData($name, array $dependencies) { $this->graph = NULL; $this->data[$name] = new ConfigEntityDependency($name, ['dependencies' => $dependencies]); return $this; diff --git a/core/modules/system/src/Form/ModulesUninstallConfirmForm.php b/core/modules/system/src/Form/ModulesUninstallConfirmForm.php index ac32f54..d6e5b15 100644 --- a/core/modules/system/src/Form/ModulesUninstallConfirmForm.php +++ b/core/modules/system/src/Form/ModulesUninstallConfirmForm.php @@ -190,7 +190,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $form['entity_deletes'] = array( '#type' => 'details', - '#title' => $this->t('Configuration deletes'), + '#title' => $this->t('Configuration deletions'), '#description' => $this->t('The listed configuration will be deleted.'), '#collapsible' => TRUE, '#collapsed' => TRUE, diff --git a/core/modules/system/src/Tests/Module/UninstallTest.php b/core/modules/system/src/Tests/Module/UninstallTest.php index 39cb7a2..4032a90 100644 --- a/core/modules/system/src/Tests/Module/UninstallTest.php +++ b/core/modules/system/src/Tests/Module/UninstallTest.php @@ -64,7 +64,7 @@ function testUninstallPage() { $edit = array(); $edit['uninstall[module_test]'] = TRUE; $this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall')); - $this->assertNoText(\Drupal::translation()->translate('Configuration deletes'), 'No configuration deletions listed on the module install confirmation page.'); + $this->assertNoText(\Drupal::translation()->translate('Configuration deletions'), 'No configuration deletions listed on the module install confirmation page.'); $this->assertText(\Drupal::translation()->translate('Configuration updates'), 'Configuration updates listed on the module install confirmation page.'); $this->assertText($node_type->label(), String::format('The entity label "!label" found.', array('!label' => $node_type->label()))); $this->drupalPostForm(NULL, NULL, t('Uninstall')); @@ -76,7 +76,7 @@ function testUninstallPage() { $edit = array(); $edit['uninstall[node]'] = TRUE; $this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall')); - $this->assertText(\Drupal::translation()->translate('Configuration deletes'), 'Configuration deletions listed on the module install confirmation page.'); + $this->assertText(\Drupal::translation()->translate('Configuration deletions'), 'Configuration deletions listed on the module install confirmation page.'); $this->assertNoText(\Drupal::translation()->translate('Configuration updates'), 'No configuration updates listed on the module install confirmation page.'); $entity_types = array();