From 98fecd860d7b48717e4b667b9afd519ab9cf5b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Garn=C3=A6s?= <kasperg@users.noreply.github.com>
Date: Fri, 6 Dec 2024 14:13:42 +0100
Subject: [PATCH] Revert "Merge pull request #1806 from
 danskernesdigitalebibliotek/remove-config-filter"

Reintroduce config filter module

Running the uninstall hook if the module is not present will fail and
cause subsequent update hooks to fail also.

Webmaster modules are only updated once a month so removing the module
in the release just after the module has been uninstalled will trigger
this problem.

Consequently we reintroduce this module and wait for release 2024.48.0
to have been rolled out across all sites.

This reverts commit f855ba2cde951ec906ffb159c731ffcfe454a961, reversing
changes made to f0d0fc7808837ba6a4491ece0dfa1dbe05f73c43.

# Conflicts:
#	composer.lock
---
 composer.json |  1 +
 composer.lock | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 3eb52cea5..a0b0bc991 100644
--- a/composer.json
+++ b/composer.json
@@ -102,6 +102,7 @@
         "drupal/antibot": "^2.0",
         "drupal/azure_mailer": "^2.0",
         "drupal/color_field": "^3.0",
+        "drupal/config_filter": "^2.6",
         "drupal/config_ignore": "^3",
         "drupal/config_ignore_auto": "^3",
         "drupal/config_perms": "^2.1",
diff --git a/composer.lock b/composer.lock
index 834f682e8..0ab7b08e6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d89be314a09f03f216ca135be18c887d",
+    "content-hash": "1c68335f546275ac82cdd7fa9c651d28",
     "packages": [
         {
             "name": "amazeeio/drupal_integrations",
@@ -2802,6 +2802,75 @@
                 "issues": "https://www.drupal.org/project/issues/color_field?version=8.x"
             }
         },
+        {
+            "name": "drupal/config_filter",
+            "version": "2.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/config_filter.git",
+                "reference": "8.x-2.6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-2.6.zip",
+                "reference": "8.x-2.6",
+                "shasum": "fd1a057a402436fc906c63bf0a74722f73b9b155"
+            },
+            "require": {
+                "drupal/core": "^8.8 || ^9 || ^10"
+            },
+            "conflict": {
+                "drush/drush": "<10"
+            },
+            "suggest": {
+                "drupal/config_split": "Split site configuration for different environments."
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "8.x-2.6",
+                    "datestamp": "1698308577",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Fabian Bircher",
+                    "homepage": "https://www.drupal.org/u/bircher",
+                    "email": "opensource@fabianbircher.com",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Nuvole Web",
+                    "homepage": "http://nuvole.org",
+                    "email": "info@nuvole.org",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "pescetti",
+                    "homepage": "https://www.drupal.org/user/436244"
+                }
+            ],
+            "description": "Config Filter allows other modules to interact with a ConfigStorage through filter plugins.",
+            "homepage": "https://www.drupal.org/project/config_filter",
+            "keywords": [
+                "Drupal",
+                "configuration",
+                "configuration management"
+            ],
+            "support": {
+                "source": "https://git.drupalcode.org/project/config_filter",
+                "issues": "https://www.drupal.org/project/issues/config_filter",
+                "slack": "https://drupal.slack.com/archives/C45342CDD"
+            }
+        },
         {
             "name": "drupal/config_ignore",
             "version": "3.3.0",