diff --git a/composer.json b/composer.json
index 94910c4418ea7c6751639e6203da8241e42665d5..7204351971ee2fc2aa350a4141a49d4dcd6bbfca 100644
--- a/composer.json
+++ b/composer.json
@@ -100,7 +100,7 @@
"drupal/cache_control_override": "^1.0@alpha",
"drupal/ckeditor_indentblock": "1.0.0-beta2",
"drupal/config_direct_save": "2.1",
- "drupal/config_filter": "1.9",
+ "drupal/config_filter": "1.10",
"drupal/config_ignore": "2.3",
"drupal/config_update": "1.7",
"drupal/console": "1.9.7",
diff --git a/composer.lock b/composer.lock
index 3d84be18051d9d63b992edddfdb904416ef334f2..68f36fd06e0f92078347d9d0ed7fe6cede767088 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2495,20 +2495,20 @@
},
{
"name": "drupal/config_filter",
- "version": "1.9.0",
+ "version": "1.10.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/config_filter.git",
- "reference": "8.x-1.9"
+ "reference": "8.x-1.10"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-1.9.zip",
- "reference": "8.x-1.9",
- "shasum": "cf6919fc5039771f8e6c2ed203f29ab0eca8d91f"
+ "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-1.10.zip",
+ "reference": "8.x-1.10",
+ "shasum": "c5002f2b9dece3c684db754123936d1388b80b8d"
},
"require": {
- "drupal/core": "^8 || ^9"
+ "drupal/core": "^8.8 || ^9 || ^10"
},
"suggest": {
"drupal/config_split": "Split site configuration for different environments."
@@ -2516,8 +2516,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.9",
- "datestamp": "1649336052",
+ "version": "8.x-1.10",
+ "datestamp": "1656936763",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 93609b42da64af756d638afaf2e3085e23280505..1c1c3337f49ac37576830aa9e8e927808d2622c3 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2578,21 +2578,21 @@
},
{
"name": "drupal/config_filter",
- "version": "1.9.0",
- "version_normalized": "1.9.0.0",
+ "version": "1.10.0",
+ "version_normalized": "1.10.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/config_filter.git",
- "reference": "8.x-1.9"
+ "reference": "8.x-1.10"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-1.9.zip",
- "reference": "8.x-1.9",
- "shasum": "cf6919fc5039771f8e6c2ed203f29ab0eca8d91f"
+ "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-1.10.zip",
+ "reference": "8.x-1.10",
+ "shasum": "c5002f2b9dece3c684db754123936d1388b80b8d"
},
"require": {
- "drupal/core": "^8 || ^9"
+ "drupal/core": "^8.8 || ^9 || ^10"
},
"suggest": {
"drupal/config_split": "Split site configuration for different environments."
@@ -2600,8 +2600,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.9",
- "datestamp": "1649336052",
+ "version": "8.x-1.10",
+ "datestamp": "1656936763",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index b3c270d8bd5857bc475dd88d92674f4bff4adee2..fa7b7e1342091f6959b0df58a309b06f005e9f2c 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -410,9 +410,9 @@
'dev_requirement' => false,
),
'drupal/config_filter' => array(
- 'pretty_version' => '1.9.0',
- 'version' => '1.9.0.0',
- 'reference' => '8.x-1.9',
+ 'pretty_version' => '1.10.0',
+ 'version' => '1.10.0.0',
+ 'reference' => '8.x-1.10',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/config_filter',
'aliases' => array(),
diff --git a/web/modules/config_filter/.gitlab-ci.yml b/web/modules/config_filter/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c267217de4145014a1bfd405793e602ef3120b16
--- /dev/null
+++ b/web/modules/config_filter/.gitlab-ci.yml
@@ -0,0 +1,2 @@
+include:
+ - remote: 'https://gitlab.com/drupalspoons/composer-plugin/-/raw/2.9.7/templates/.gitlab-ci.yml'
diff --git a/web/modules/config_filter/config_filter.info.yml b/web/modules/config_filter/config_filter.info.yml
index 9d50c853309506b428e7d066ca4e128e46324be5..4c39862f5715f952d4e82bfe5c84e6b0949f6b00 100644
--- a/web/modules/config_filter/config_filter.info.yml
+++ b/web/modules/config_filter/config_filter.info.yml
@@ -1,11 +1,10 @@
name: Config Filter
type: module
description: Config Filter allows other modules to interact with a ConfigStorage through filter plugins.
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8.8 || ^9 || ^10
package: Config
-# Information added by Drupal.org packaging script on 2022-04-07
-version: '8.x-1.9'
+# Information added by Drupal.org packaging script on 2022-07-04
+version: '8.x-1.10'
project: 'config_filter'
-datestamp: 1649336058
+datestamp: 1656936766
diff --git a/web/modules/config_filter/src/ConfigFilterServiceProvider.php b/web/modules/config_filter/src/ConfigFilterServiceProvider.php
index b6777fc040acd9ff9b9acfac5236f6ce5a50f21c..9c64b38bd15da0715a83c7ba36a4636fb2030fbf 100644
--- a/web/modules/config_filter/src/ConfigFilterServiceProvider.php
+++ b/web/modules/config_filter/src/ConfigFilterServiceProvider.php
@@ -34,6 +34,7 @@ public function alter(ContainerBuilder $container) {
$container->setDefinition('config_filter.storage.original', $original);
$definition = new Definition(FilteredStorage::class);
+ $definition->setPublic(TRUE);
$definition->setFactory([new Reference('config_filter.storage_factory'), 'getSync']);
$container->setDefinition($id, $definition);
}
diff --git a/web/modules/config_filter/src/Tests/FilteredStorageTest.php b/web/modules/config_filter/src/Tests/FilteredStorageTest.php
index e4290445013ada00824d0e31e5e32e7d109f2cde..e1e3223b951a52535bfba7e3de201ac5eabaa29c 100644
--- a/web/modules/config_filter/src/Tests/FilteredStorageTest.php
+++ b/web/modules/config_filter/src/Tests/FilteredStorageTest.php
@@ -376,6 +376,7 @@ public function testInvalidStorageFilterArgument() {
// We would do this with $this->expectException but alas drupal is stuck on
// phpunit 4 and we try not to add deprecated code.
try {
+ // @phpstan-ignore-next-line Wrong arguments is what we test here.
new FilteredStorage($source->reveal(), [new \stdClass()]);
$this->fail('An exception should have been thrown.');
}
diff --git a/web/modules/config_filter/tests/modules/config_filter_split_test/config_filter_split_test.info.yml b/web/modules/config_filter/tests/modules/config_filter_split_test/config_filter_split_test.info.yml
index 32c02faf24a93b2896ab3c66bce8143f98eb587a..39618df317b63a8cda14664fde89a5dee5b103b6 100644
--- a/web/modules/config_filter/tests/modules/config_filter_split_test/config_filter_split_test.info.yml
+++ b/web/modules/config_filter/tests/modules/config_filter_split_test/config_filter_split_test.info.yml
@@ -1,12 +1,12 @@
name: 'Simple split filter'
type: module
-core: 8.x
-core_version_requirement: ^8 || ^9
+description: Test module with a simple filter.
+core_version_requirement: ^8.8 || ^9 || ^10
package: Testing
dependencies:
- config_filter:config_filter
-# Information added by Drupal.org packaging script on 2022-04-07
-version: '8.x-1.9'
+# Information added by Drupal.org packaging script on 2022-07-04
+version: '8.x-1.10'
project: 'config_filter'
-datestamp: 1649336058
+datestamp: 1656936766
diff --git a/web/modules/config_filter/tests/modules/config_filter_split_test/src/Plugin/ConfigFilter/TestSplitFilter.php b/web/modules/config_filter/tests/modules/config_filter_split_test/src/Plugin/ConfigFilter/TestSplitFilter.php
index 39d112f6a96a6977b166990f1f3532ea7ac2b246..a9636df22f4ddc5a5a7760878b2c3e43dcf17779 100644
--- a/web/modules/config_filter/tests/modules/config_filter_split_test/src/Plugin/ConfigFilter/TestSplitFilter.php
+++ b/web/modules/config_filter/tests/modules/config_filter_split_test/src/Plugin/ConfigFilter/TestSplitFilter.php
@@ -144,7 +144,7 @@ public function filterDelete($name, $delete) {
* {@inheritdoc}
*/
public function filterDeleteAll($prefix, $delete) {
- if ($delete && $this->storage) {
+ if ($delete) {
try {
$this->storage->deleteAll($prefix);
}
diff --git a/web/modules/config_filter/tests/modules/config_filter_test/config_filter_test.info.yml b/web/modules/config_filter/tests/modules/config_filter_test/config_filter_test.info.yml
index 3d4835ec3999a81b68064d0fb177584460bf4d05..41956caeb62076bf98df86459c77f728cbee6012 100644
--- a/web/modules/config_filter/tests/modules/config_filter_test/config_filter_test.info.yml
+++ b/web/modules/config_filter/tests/modules/config_filter_test/config_filter_test.info.yml
@@ -1,12 +1,12 @@
name: Config Filter Test
type: module
-core: 8.x
-core_version_requirement: ^8 || ^9
+description: Test module with the pirate filter.
+core_version_requirement: ^8.8 || ^9 || ^10
package: Testing
dependencies:
- config_filter:config_filter
-# Information added by Drupal.org packaging script on 2022-04-07
-version: '8.x-1.9'
+# Information added by Drupal.org packaging script on 2022-07-04
+version: '8.x-1.10'
project: 'config_filter'
-datestamp: 1649336058
+datestamp: 1656936766
diff --git a/web/modules/config_filter/tests/modules/config_filter_test/src/Plugin/ConfigFilter/PirateFilter.php b/web/modules/config_filter/tests/modules/config_filter_test/src/Plugin/ConfigFilter/PirateFilter.php
index c6b38d5eafdf7f55ccb8b3fd10d16db98df15013..24dd76e8463e0ccaf254b873c7eb31dc8d0532c5 100644
--- a/web/modules/config_filter/tests/modules/config_filter_test/src/Plugin/ConfigFilter/PirateFilter.php
+++ b/web/modules/config_filter/tests/modules/config_filter_test/src/Plugin/ConfigFilter/PirateFilter.php
@@ -22,8 +22,9 @@ public function filterRead($name, $data) {
if ($name == 'system.site') {
$data['name'] = $data['name'] . ' Arrr';
}
-
+ // @phpstan-ignore-next-line Drupal state in test is acceptable.
if ($name === 'system.pirates' && \Drupal::state()->get('config_filter_test_bluff', FALSE)) {
+ $data = is_array($data) ? $data : [];
$data['captain'] = 'n/a';
}
@@ -52,6 +53,7 @@ public function filterListAll($prefix, array $data) {
* {@inheritdoc}
*/
public function filterExists($name, $exists) {
+ // @phpstan-ignore-next-line Drupal state in test is acceptable.
if ($name === 'system.pirates' && \Drupal::state()->get('config_filter_test_bluff', FALSE)) {
return TRUE;
}
diff --git a/web/modules/config_filter/tests/src/Kernel/ConfigFilterStorageFactoryTest.php b/web/modules/config_filter/tests/src/Kernel/ConfigFilterStorageFactoryTest.php
index 2e089d745375afd5a430d64d1a5556c7ce3d7100..b83e4a6f7c61df68b9c647332e40b3f129211017 100644
--- a/web/modules/config_filter/tests/src/Kernel/ConfigFilterStorageFactoryTest.php
+++ b/web/modules/config_filter/tests/src/Kernel/ConfigFilterStorageFactoryTest.php
@@ -18,7 +18,7 @@ class ConfigFilterStorageFactoryTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = [
+ protected static $modules = [
'system',
'config_filter',
'config_filter_test',
diff --git a/web/modules/config_filter/tests/src/Kernel/ExampleStorageKernelTest.php b/web/modules/config_filter/tests/src/Kernel/ExampleStorageKernelTest.php
index bfa4ea574811e6b2bd3b20b6df2e4d28f8011bb3..f30219061be25e4d7c62ec54673b9755837b87b4 100644
--- a/web/modules/config_filter/tests/src/Kernel/ExampleStorageKernelTest.php
+++ b/web/modules/config_filter/tests/src/Kernel/ExampleStorageKernelTest.php
@@ -19,7 +19,7 @@ class ExampleStorageKernelTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = [
+ protected static $modules = [
'system',
'config_filter',
'config_filter_test',