From 8b357ad28f2cd700e69034a153a5cbe4dde279e3 Mon Sep 17 00:00:00 2001
From: Anish Choudhary <69810-anish.ir@users.noreply.drupalcode.org>
Date: Fri, 3 Jan 2025 12:12:13 +0530
Subject: [PATCH] Issue #3497034: Changed config filter references.
---
config/schema/config_patch.schema.yml | 2 +-
src/ConfigCompare.php | 4 ++--
src/Form/ConfigPatchSettings.php | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/config/schema/config_patch.schema.yml b/config/schema/config_patch.schema.yml
index 57b4409..9335ea1 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 a698f60..be16116 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 7462f06..a3faa22 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,
];
--
GitLab