diff --git a/config/schema/config_patch.schema.yml b/config/schema/config_patch.schema.yml index 57b4409920e9fe2c89ad8a8e35980c5f21768f7a..9335ea1b192e6e117e5028ae62ebd53e67f146f2 100644 --- a/config/schema/config_patch.schema.yml +++ b/config/schema/config_patch.schema.yml @@ -10,4 +10,4 @@ config_patch.settings: label: 'Output plugin' respect_filter: type: boolean - label: 'Respect config_filter filtering' + label: 'Respect config_ignore filtering' diff --git a/src/ConfigCompare.php b/src/ConfigCompare.php index a698f6066d6f7b186e68d32d9ca051b6aed8acae..be1611694b2f4b0d38e209bdb52277f24725c5b0 100644 --- a/src/ConfigCompare.php +++ b/src/ConfigCompare.php @@ -238,14 +238,14 @@ class ConfigCompare { } else { $changes = []; - if ($this->config->get('respect_filter') && \Drupal::service('module_handler')->moduleExists('config_filter')) { + if ($this->config->get('respect_filter') && \Drupal::service('module_handler')->moduleExists('config_ignore')) { // From ConfigFilterEventSubscriber::onExportTransform(). // The temporary storage representing the sync storage. $temp = new MemoryStorage(); // Copy the contents of the sync storage to the temporary one. self::replaceStorageContents($this->syncStorage, $temp); // Get the simulated filtered sync storage. - $filtered = \Drupal::service('config_filter.storage_factory')->getFilteredStorage($temp, ['config.storage.sync']); + $filtered = \Drupal::service('config_ignore.storage_factory')->getFilteredStorage($temp, ['config.storage.sync']); $storage_comparer = new StorageComparer($this->exportStorage, $filtered, $this->configManager); } else { diff --git a/src/Form/ConfigPatchSettings.php b/src/Form/ConfigPatchSettings.php index 7462f06c175f5be32c4f13ca68d4341471ddc07b..a3faa22fb3a981a65d4dc2c80bf38c15b6172f7f 100644 --- a/src/Form/ConfigPatchSettings.php +++ b/src/Form/ConfigPatchSettings.php @@ -78,11 +78,11 @@ class ConfigPatchSettings extends ConfigFormBase { '#options' => $output_opts, ]; - if ($this->moduleHandler->moduleExists('config_filter')) { + if ($this->moduleHandler->moduleExists('config_ignore')) { $form['respect_filter'] = [ '#type' => 'checkbox', '#title' => $this->t('Respect config_ignore filtering'), - '#description' => $this->t('Do not show changes that are filtered by config_filter (i.e., using config_split or config_ignore)'), + '#description' => $this->t('Do not show changes that are filtered by config_ignore (i.e., using config_split or config_ignore)'), '#default_value' => $config->get('respect_filter') ?? 0, '#return_value' => 1, ];