From 20e1983ea9670adcf95dc9b32a699d204ae14fc7 Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Tue, 24 Oct 2023 09:58:46 -0300 Subject: [PATCH 1/3] Add Config Override Inspector (COI). --- composer.json | 4 +- composer.lock | 407 ++++++++++++------ config/sync/coi.settings.yml | 13 + config/sync/core.extension.yml | 4 +- ...api_solr.solr_field_type.text_en_6_0_0.yml | 4 +- ...api_solr.solr_field_type.text_en_7_0_0.yml | 4 +- ...solr_field_type.text_phonetic_en_7_0_0.yml | 2 +- ...pi_solr.solr_field_type.text_und_6_0_0.yml | 6 +- ...pi_solr.solr_field_type.text_und_7_0_0.yml | 6 +- 9 files changed, 307 insertions(+), 143 deletions(-) create mode 100644 config/sync/coi.settings.yml diff --git a/composer.json b/composer.json index c81799c26..430cce3e4 100755 --- a/composer.json +++ b/composer.json @@ -35,6 +35,8 @@ "drupal/better_exposed_filters": "^6.0", "drupal/bibcite": "^2.0@beta", "drupal/citation_select": "^1.0@beta", + "drupal/coi": "^4.0", + "drupal/config_override_warn": "^1.4", "drupal/config_update": "^2.0@alpha", "drupal/context": "^5@RC", "drupal/controlled_access_terms": "^2", @@ -60,7 +62,7 @@ "drupal/views_field_view": "^1.0@beta", "drush/drush": "^12", "islandora-rdm/islandora_fits": "dev-8.x-1.x as 1.x-dev", - "islandora/islandora": "2.9.0", + "islandora/islandora": "^2.8.1", "islandora/islandora_mirador": "^2", "islandora/views_nested_details": "^1.0", "library/pdf.js": "^2.4", diff --git a/composer.lock b/composer.lock index a315b5db4..71fa4a36e 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": "0c8792f9dda4225d409cc09ec61f7789", + "content-hash": "79d6e506b61dc633692a247812296960", "packages": [ { "name": "academicpuma/citeproc-php", @@ -335,16 +335,16 @@ }, { "name": "chi-teck/drupal-code-generator", - "version": "3.2.0", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/Chi-teck/drupal-code-generator.git", - "reference": "6883a423f21446b16f8b9a2d90cc5abd4bc3e5d6" + "reference": "56da9209b24a5a5b5d27bec9e523f02bdd101770" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/6883a423f21446b16f8b9a2d90cc5abd4bc3e5d6", - "reference": "6883a423f21446b16f8b9a2d90cc5abd4bc3e5d6", + "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/56da9209b24a5a5b5d27bec9e523f02bdd101770", + "reference": "56da9209b24a5a5b5d27bec9e523f02bdd101770", "shasum": "" }, "require": { @@ -363,7 +363,7 @@ }, "require-dev": { "chi-teck/drupal-coder-extension": "^2.0.0-alpha4", - "drupal/coder": "8.3.20", + "drupal/coder": "8.3.22", "drupal/core": "10.1.x-dev", "ext-simplexml": "*", "phpspec/prophecy-phpunit": "^2.0", @@ -389,9 +389,9 @@ "description": "Drupal code generator", "support": { "issues": "https://github.com/Chi-teck/drupal-code-generator/issues", - "source": "https://github.com/Chi-teck/drupal-code-generator/tree/3.2.0" + "source": "https://github.com/Chi-teck/drupal-code-generator/tree/3.3.0" }, - "time": "2023-08-06T11:19:01+00:00" + "time": "2023-10-21T12:57:05+00:00" }, { "name": "composer/installers", @@ -1548,17 +1548,17 @@ }, { "name": "drupal/advanced_search", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/advanced_search.git", - "reference": "2.0.0" + "reference": "2.0.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/advanced_search-2.0.0.zip", - "reference": "2.0.0", - "shasum": "c5417df7fb411dea032975ea1dfb87e9f658a589" + "url": "https://ftp.drupal.org/files/projects/advanced_search-2.0.1.zip", + "reference": "2.0.1", + "shasum": "698f1690c7e88c6fe4ac21a9bfb431c26696f530" }, "require": { "drupal/core": "^8.8 || ^9 || ^10", @@ -1574,8 +1574,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0", - "datestamp": "1695751418", + "version": "2.0.1", + "datestamp": "1697564812", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" @@ -1857,6 +1857,151 @@ "source": "https://git.drupalcode.org/project/citation_select" } }, + { + "name": "drupal/coi", + "version": "4.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/coi.git", + "reference": "4.0.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/coi-4.0.0.zip", + "reference": "4.0.0", + "shasum": "1a77866371a3dae553e5861f95ba2e26c76c0055" + }, + "require": { + "drupal/config_override_core_fields": "^4", + "drupal/core": "^10", + "php": ">=8.1" + }, + "suggest": { + "drupal/token": "Shows Token UI on COI settings form." + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "4.0.0", + "datestamp": "1693238227", + "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": "Daniel Phin", + "homepage": "http://danielph.in", + "email": "pro@danielph.in", + "role": "Maintainer" + } + ], + "homepage": "https://www.drupal.org/project/coi", + "support": { + "source": "https://github.com/dpi/coi", + "issues": "https://github.com/dpi/coi/issues" + } + }, + { + "name": "drupal/config_override_core_fields", + "version": "4.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/config_override_core_fields.git", + "reference": "4.0.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/config_override_core_fields-4.0.0.zip", + "reference": "4.0.0", + "shasum": "db281661d21907f711946848bf2f97fd2304a36a" + }, + "require": { + "drupal/core": ">=10", + "php": ">=8.1" + }, + "require-dev": { + "drupal/coi": ">=4" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "4.0.0", + "datestamp": "1693238348", + "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": "Daniel Phin", + "homepage": "http://danielph.in", + "email": "pro@danielph.in", + "role": "Maintainer" + } + ], + "homepage": "https://www.drupal.org/project/config_override_core_fields", + "support": { + "source": "https://github.com/dpi/config_override_core_fields", + "issues": "https://github.com/dpi/config_override_core_fields/issues" + } + }, + { + "name": "drupal/config_override_warn", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/config_override_warn.git", + "reference": "8.x-1.4" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/config_override_warn-8.x-1.4.zip", + "reference": "8.x-1.4", + "shasum": "d8f7eb24769bf58bda6de882a015ea288ea5643c" + }, + "require": { + "drupal/core": "^9 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.4", + "datestamp": "1680829138", + "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": "Dave Reid", + "homepage": "https://www.drupal.org/user/53892" + } + ], + "description": "Provide a warning message on configuration forms when any values on the form are possibly being overridden.", + "homepage": "https://www.drupal.org/project/config_override_warn", + "support": { + "source": "https://git.drupalcode.org/project/config_override_warn" + } + }, { "name": "drupal/config_update", "version": "2.0.0-alpha3", @@ -3061,6 +3206,10 @@ "GPL-2.0-or-later" ], "authors": [ + { + "name": "Anybody", + "homepage": "https://www.drupal.org/user/291091" + }, { "name": "Hydra", "homepage": "https://www.drupal.org/user/647364" @@ -3533,17 +3682,17 @@ }, { "name": "drupal/islandora", - "version": "2.8.3", + "version": "2.9.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/islandora.git", - "reference": "2.8.3" + "reference": "2.9.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/islandora-2.8.3.zip", - "reference": "2.8.3", - "shasum": "21a9b60def56310cb6cb6efa557ed2c2a6494ea0" + "url": "https://ftp.drupal.org/files/projects/islandora-2.9.1.zip", + "reference": "2.9.1", + "shasum": "9e7b40aa422676684ac2dfbfd614d0a77d8a8c50" }, "require": { "drupal/context": "^4 || ^5@RC", @@ -3580,8 +3729,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.8.3", - "datestamp": "1695059104", + "version": "2.9.1", + "datestamp": "1698071313", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" @@ -4751,17 +4900,17 @@ }, { "name": "drupal/rest_oai_pmh", - "version": "2.0.0-beta12", + "version": "2.0.0-beta15", "source": { "type": "git", "url": "https://git.drupalcode.org/project/rest_oai_pmh.git", - "reference": "2.0.0-beta12" + "reference": "2.0.0-beta15" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/rest_oai_pmh-2.0.0-beta12.zip", - "reference": "2.0.0-beta12", - "shasum": "83a2ffcf6e61085548ecda2d84a9d43bea9bccab" + "url": "https://ftp.drupal.org/files/projects/rest_oai_pmh-2.0.0-beta15.zip", + "reference": "2.0.0-beta15", + "shasum": "8c9ab48198a5a0a2e9657f2d85c1a80f70dd0476" }, "require": { "drupal/core": "^9 || ^10" @@ -4769,8 +4918,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0-beta12", - "datestamp": "1686681467", + "version": "2.0.0-beta15", + "datestamp": "1697747057", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -4799,17 +4948,17 @@ }, { "name": "drupal/search_api", - "version": "1.29.0", + "version": "1.30.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api.git", - "reference": "8.x-1.29" + "reference": "8.x-1.30" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.29.zip", - "reference": "8.x-1.29", - "shasum": "4663abbcfe5dfc159ee0886fc6c437e998fc0653" + "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.30.zip", + "reference": "8.x-1.30", + "shasum": "25bd2cfab6a6332c595fbc8be1c4cfff33a85ce8" }, "require": { "drupal/core": "^9.3 || ^10.0" @@ -4830,8 +4979,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.29", - "datestamp": "1679910252", + "version": "8.x-1.30", + "datestamp": "1697366291", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4839,7 +4988,7 @@ }, "drush": { "services": { - "drush.services.yml": "^9 || ^10" + "drush.services.yml": "^9 || ^10 || ^11" } } }, @@ -5180,17 +5329,17 @@ }, { "name": "drupal/token", - "version": "1.12.0", + "version": "1.13.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/token.git", - "reference": "8.x-1.12" + "reference": "8.x-1.13" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/token-8.x-1.12.zip", - "reference": "8.x-1.12", - "shasum": "cefe1b203b793682f74ea43e18d0a814cf768763" + "url": "https://ftp.drupal.org/files/projects/token-8.x-1.13.zip", + "reference": "8.x-1.13", + "shasum": "f2a074b51726de3727c1d900237d6d471806a4d2" }, "require": { "drupal/core": "^9.2 || ^10" @@ -5198,8 +5347,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.12", - "datestamp": "1688015262", + "version": "8.x-1.13", + "datestamp": "1697885927", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5207,7 +5356,7 @@ }, "drush": { "services": { - "drush.services.yml": "^9 || ^10" + "drush.services.yml": ">=9" } } }, @@ -5494,16 +5643,16 @@ }, { "name": "drush/drush", - "version": "12.2.0", + "version": "12.3.0", "source": { "type": "git", "url": "https://github.com/drush-ops/drush.git", - "reference": "b924aa6cfad1c0eb3ae853ccc373422c16184b8e" + "reference": "a83c9ae56728dd6f99aa5d150c11e5e3656030a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drush-ops/drush/zipball/b924aa6cfad1c0eb3ae853ccc373422c16184b8e", - "reference": "b924aa6cfad1c0eb3ae853ccc373422c16184b8e", + "url": "https://api.github.com/repos/drush-ops/drush/zipball/a83c9ae56728dd6f99aa5d150c11e5e3656030a5", + "reference": "a83c9ae56728dd6f99aa5d150c11e5e3656030a5", "shasum": "" }, "require": { @@ -5626,7 +5775,7 @@ "issues": "https://github.com/drush-ops/drush/issues", "security": "https://github.com/drush-ops/drush/security/advisories", "slack": "https://drupal.slack.com/messages/C62H9CWQM", - "source": "https://github.com/drush-ops/drush/tree/12.2.0" + "source": "https://github.com/drush-ops/drush/tree/12.3.0" }, "funding": [ { @@ -5634,7 +5783,7 @@ "type": "github" } ], - "time": "2023-09-08T12:42:05+00:00" + "time": "2023-10-11T11:25:44+00:00" }, { "name": "easyrdf/easyrdf", @@ -6478,16 +6627,16 @@ }, { "name": "islandora/islandora", - "version": "2.9.0", + "version": "2.9.1", "source": { "type": "git", "url": "https://github.com/Islandora/islandora.git", - "reference": "e2ec6730178d0a3a2aca9274f3c8e902e9297868" + "reference": "572ffcf2e1c823a769173088af8f83773a4615c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Islandora/islandora/zipball/e2ec6730178d0a3a2aca9274f3c8e902e9297868", - "reference": "e2ec6730178d0a3a2aca9274f3c8e902e9297868", + "url": "https://api.github.com/repos/Islandora/islandora/zipball/572ffcf2e1c823a769173088af8f83773a4615c4", + "reference": "572ffcf2e1c823a769173088af8f83773a4615c4", "shasum": "" }, "require": { @@ -6543,9 +6692,9 @@ ], "support": { "issues": "https://github.com/Islandora/documentation/issues", - "source": "https://github.com/Islandora/islandora/tree/2.9.0" + "source": "https://github.com/Islandora/islandora/tree/2.9.1" }, - "time": "2023-09-25T13:58:08+00:00" + "time": "2023-10-18T17:14:42+00:00" }, { "name": "islandora/islandora_mirador", @@ -7042,16 +7191,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.13.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96" + "reference": "b6a5854368533df0295c5761a0253656a2e52d9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/a6dfb1194a2946fcdc1f38219445234f65b35c96", - "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e", + "reference": "b6a5854368533df0295c5761a0253656a2e52d9e", "shasum": "" }, "require": { @@ -7082,7 +7231,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.13.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.14.0" }, "funding": [ { @@ -7094,7 +7243,7 @@ "type": "tidelift" } ], - "time": "2023-08-05T12:09:49+00:00" + "time": "2023-10-17T14:13:20+00:00" }, { "name": "library/pdf.js", @@ -8511,16 +8660,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.21", + "version": "v0.11.22", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "bcb22101107f3bf770523b65630c9d547f60c540" + "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/bcb22101107f3bf770523b65630c9d547f60c540", - "reference": "bcb22101107f3bf770523b65630c9d547f60c540", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b", + "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b", "shasum": "" }, "require": { @@ -8549,7 +8698,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "0.11.x-dev" + "dev-0.11": "0.11.x-dev" }, "bamarni-bin": { "bin-links": false, @@ -8585,9 +8734,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.21" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.22" }, - "time": "2023-09-17T21:15:54+00:00" + "time": "2023-10-14T21:56:36+00:00" }, { "name": "ralouphie/getallheaders", @@ -8701,16 +8850,16 @@ }, { "name": "solarium/solarium", - "version": "6.3.2", + "version": "6.3.3", "source": { "type": "git", "url": "https://github.com/solariumphp/solarium.git", - "reference": "52e5623102bd8b056d159eea8cce991d21cb8593" + "reference": "90e42bf322217cc1f26439e61b0c7d17fedb3a9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/solariumphp/solarium/zipball/52e5623102bd8b056d159eea8cce991d21cb8593", - "reference": "52e5623102bd8b056d159eea8cce991d21cb8593", + "url": "https://api.github.com/repos/solariumphp/solarium/zipball/90e42bf322217cc1f26439e61b0c7d17fedb3a9c", + "reference": "90e42bf322217cc1f26439e61b0c7d17fedb3a9c", "shasum": "" }, "require": { @@ -8762,9 +8911,9 @@ ], "support": { "issues": "https://github.com/solariumphp/solarium/issues", - "source": "https://github.com/solariumphp/solarium/tree/6.3.2" + "source": "https://github.com/solariumphp/solarium/tree/6.3.3" }, - "time": "2023-09-19T06:59:53+00:00" + "time": "2023-10-14T14:46:33+00:00" }, { "name": "stomp-php/stomp-php", @@ -9436,16 +9585,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.3.5", + "version": "v6.3.6", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "b50f5e281d722cb0f4c296f908bacc3e2b721957" + "reference": "c186627f52febe09c6d5270b04f8462687a250a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b50f5e281d722cb0f4c296f908bacc3e2b721957", - "reference": "b50f5e281d722cb0f4c296f908bacc3e2b721957", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/c186627f52febe09c6d5270b04f8462687a250a6", + "reference": "c186627f52febe09c6d5270b04f8462687a250a6", "shasum": "" }, "require": { @@ -9455,12 +9604,12 @@ "symfony/polyfill-php83": "^1.27" }, "conflict": { - "symfony/cache": "<6.2" + "symfony/cache": "<6.3" }, "require-dev": { - "doctrine/dbal": "^2.13.1|^3.0", + "doctrine/dbal": "^2.13.1|^3|^4", "predis/predis": "^1.1|^2.0", - "symfony/cache": "^5.4|^6.0", + "symfony/cache": "^6.3", "symfony/dependency-injection": "^5.4|^6.0", "symfony/expression-language": "^5.4|^6.0", "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4", @@ -9493,7 +9642,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.3.5" + "source": "https://github.com/symfony/http-foundation/tree/v6.3.6" }, "funding": [ { @@ -9509,20 +9658,20 @@ "type": "tidelift" } ], - "time": "2023-09-04T21:33:54+00:00" + "time": "2023-10-17T11:32:53+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.3.5", + "version": "v6.3.6", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "9f991a964368bee8d883e8d57ced4fe9fff04dfc" + "reference": "4945f5001b06ff9080cd3d8f1f9f069094c0d156" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9f991a964368bee8d883e8d57ced4fe9fff04dfc", - "reference": "9f991a964368bee8d883e8d57ced4fe9fff04dfc", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4945f5001b06ff9080cd3d8f1f9f069094c0d156", + "reference": "4945f5001b06ff9080cd3d8f1f9f069094c0d156", "shasum": "" }, "require": { @@ -9606,7 +9755,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.3.5" + "source": "https://github.com/symfony/http-kernel/tree/v6.3.6" }, "funding": [ { @@ -9622,7 +9771,7 @@ "type": "tidelift" } ], - "time": "2023-09-30T06:37:04+00:00" + "time": "2023-10-21T13:12:51+00:00" }, { "name": "symfony/mime", @@ -10757,16 +10906,16 @@ }, { "name": "symfony/serializer", - "version": "v6.3.5", + "version": "v6.3.6", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "855fc058c8bdbb69f53834f2fdb3876c9bc0ab7c" + "reference": "8c5fb7144889839751ad9680cf4f183f60f8fbce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/855fc058c8bdbb69f53834f2fdb3876c9bc0ab7c", - "reference": "855fc058c8bdbb69f53834f2fdb3876c9bc0ab7c", + "url": "https://api.github.com/repos/symfony/serializer/zipball/8c5fb7144889839751ad9680cf4f183f60f8fbce", + "reference": "8c5fb7144889839751ad9680cf4f183f60f8fbce", "shasum": "" }, "require": { @@ -10831,7 +10980,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v6.3.5" + "source": "https://github.com/symfony/serializer/tree/v6.3.6" }, "funding": [ { @@ -10847,7 +10996,7 @@ "type": "tidelift" } ], - "time": "2023-09-29T16:18:53+00:00" + "time": "2023-10-17T11:32:53+00:00" }, { "name": "symfony/service-contracts", @@ -11019,16 +11168,16 @@ }, { "name": "symfony/translation", - "version": "v6.3.3", + "version": "v6.3.6", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "3ed078c54bc98bbe4414e1e9b2d5e85ed5a5c8bd" + "reference": "869b26c7a9d4b8a48afdd77ab36031909c87e3a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/3ed078c54bc98bbe4414e1e9b2d5e85ed5a5c8bd", - "reference": "3ed078c54bc98bbe4414e1e9b2d5e85ed5a5c8bd", + "url": "https://api.github.com/repos/symfony/translation/zipball/869b26c7a9d4b8a48afdd77ab36031909c87e3a2", + "reference": "869b26c7a9d4b8a48afdd77ab36031909c87e3a2", "shasum": "" }, "require": { @@ -11094,7 +11243,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.3.3" + "source": "https://github.com/symfony/translation/tree/v6.3.6" }, "funding": [ { @@ -11110,7 +11259,7 @@ "type": "tidelift" } ], - "time": "2023-07-31T07:08:24+00:00" + "time": "2023-10-17T11:32:53+00:00" }, { "name": "symfony/translation-contracts", @@ -11192,16 +11341,16 @@ }, { "name": "symfony/validator", - "version": "v6.3.5", + "version": "v6.3.6", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "48e815ba3b5eb72e632588dbf7ea2dc4e608ee47" + "reference": "254290aa13d591883eb36327cbe80689cee38ffb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/48e815ba3b5eb72e632588dbf7ea2dc4e608ee47", - "reference": "48e815ba3b5eb72e632588dbf7ea2dc4e608ee47", + "url": "https://api.github.com/repos/symfony/validator/zipball/254290aa13d591883eb36327cbe80689cee38ffb", + "reference": "254290aa13d591883eb36327cbe80689cee38ffb", "shasum": "" }, "require": { @@ -11268,7 +11417,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.3.5" + "source": "https://github.com/symfony/validator/tree/v6.3.6" }, "funding": [ { @@ -11284,20 +11433,20 @@ "type": "tidelift" } ], - "time": "2023-09-29T07:41:15+00:00" + "time": "2023-10-20T16:20:17+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.3.5", + "version": "v6.3.6", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "3d9999376be5fea8de47752837a3e1d1c5f69ef5" + "reference": "999ede244507c32b8e43aebaa10e9fce20de7c97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3d9999376be5fea8de47752837a3e1d1c5f69ef5", - "reference": "3d9999376be5fea8de47752837a3e1d1c5f69ef5", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/999ede244507c32b8e43aebaa10e9fce20de7c97", + "reference": "999ede244507c32b8e43aebaa10e9fce20de7c97", "shasum": "" }, "require": { @@ -11352,7 +11501,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.3.5" + "source": "https://github.com/symfony/var-dumper/tree/v6.3.6" }, "funding": [ { @@ -11368,20 +11517,20 @@ "type": "tidelift" } ], - "time": "2023-09-12T10:11:35+00:00" + "time": "2023-10-12T18:45:56+00:00" }, { "name": "symfony/var-exporter", - "version": "v6.3.4", + "version": "v6.3.6", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "df1f8aac5751871b83d30bf3e2c355770f8f0691" + "reference": "374d289c13cb989027274c86206ddc63b16a2441" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/df1f8aac5751871b83d30bf3e2c355770f8f0691", - "reference": "df1f8aac5751871b83d30bf3e2c355770f8f0691", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/374d289c13cb989027274c86206ddc63b16a2441", + "reference": "374d289c13cb989027274c86206ddc63b16a2441", "shasum": "" }, "require": { @@ -11426,7 +11575,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.3.4" + "source": "https://github.com/symfony/var-exporter/tree/v6.3.6" }, "funding": [ { @@ -11442,7 +11591,7 @@ "type": "tidelift" } ], - "time": "2023-08-16T18:14:47+00:00" + "time": "2023-10-13T09:16:49+00:00" }, { "name": "symfony/yaml", @@ -12052,26 +12201,26 @@ }, { "name": "drupal/config_inspector", - "version": "2.1.3", + "version": "2.1.5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_inspector.git", - "reference": "2.1.3" + "reference": "2.1.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_inspector-2.1.3.zip", - "reference": "2.1.3", - "shasum": "a4370f7355e8eca05919e2879211f1bc1e4dcc28" + "url": "https://ftp.drupal.org/files/projects/config_inspector-2.1.5.zip", + "reference": "2.1.5", + "shasum": "f9709d6495e1ca76c2d553ad6d0e77e9315e109a" }, "require": { - "drupal/core": "^9.2 || ^10" + "drupal/core": "^9.2 || ^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.3", - "datestamp": "1692715904", + "version": "2.1.5", + "datestamp": "1697797258", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/config/sync/coi.settings.yml b/config/sync/coi.settings.yml new file mode 100644 index 000000000..7447cd958 --- /dev/null +++ b/config/sync/coi.settings.yml @@ -0,0 +1,13 @@ +_core: + default_config_hash: bO--lQ6KgJ0tb7_TBJybomU61yvfcSyI5qRzOxpLFvE +override_behavior: disable +message: + enabled: true + template: 'This field is overridden by settings.php configuration.' +overridden_value: + enabled: true + element: true + secrets: false +styling: + selectors: true + default: true diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 6c83db215..9dd016bcb 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -14,8 +14,10 @@ module: breakpoint: 0 citation_select: 0 ckeditor5: 0 + coi: 0 comment: 0 config: 0 + config_override_core_fields: 0 config_update: 0 contact: 0 context: 0 @@ -88,7 +90,6 @@ module: path: 0 path_alias: 0 pdf: 0 - pgsql: 0 prepopulate: 0 rdf: 0 responsive_image: 0 @@ -98,7 +99,6 @@ module: search_api_solr: 0 serialization: 0 shortcut: 0 - sqlite: 0 syslog: 0 system: 0 taxonomy: 0 diff --git a/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml index ada959e58..47799298e 100644 --- a/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml @@ -14,6 +14,7 @@ field_type: name: text_en class: solr.TextField positionIncrementGap: 100 + storeOffsetsWithPositions: true analyzers: - type: index @@ -90,11 +91,11 @@ field_type: language: English - class: solr.RemoveDuplicatesTokenFilterFactory - storeOffsetsWithPositions: true unstemmed_field_type: name: text_unstemmed_en class: solr.TextField positionIncrementGap: 100 + storeOffsetsWithPositions: true analyzers: - type: index @@ -163,7 +164,6 @@ unstemmed_field_type: class: solr.LowerCaseFilterFactory - class: solr.RemoveDuplicatesTokenFilterFactory - storeOffsetsWithPositions: true spellcheck_field_type: null collated_field_type: name: collated_en diff --git a/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml index fb198f4c1..a8b897ad8 100644 --- a/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml @@ -14,6 +14,7 @@ field_type: name: text_en class: solr.TextField positionIncrementGap: 100 + storeOffsetsWithPositions: true analyzers: - type: index @@ -92,11 +93,11 @@ field_type: language: English - class: solr.RemoveDuplicatesTokenFilterFactory - storeOffsetsWithPositions: true unstemmed_field_type: name: text_unstemmed_en class: solr.TextField positionIncrementGap: 100 + storeOffsetsWithPositions: true analyzers: - type: index @@ -167,7 +168,6 @@ unstemmed_field_type: class: solr.LowerCaseFilterFactory - class: solr.RemoveDuplicatesTokenFilterFactory - storeOffsetsWithPositions: true spellcheck_field_type: null collated_field_type: name: collated_en diff --git a/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml index 94615ec4a..a63abc509 100644 --- a/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml @@ -14,6 +14,7 @@ field_type: name: text_phonetic_en class: solr.TextField positionIncrementGap: 100 + storeOffsetsWithPositions: true analyzers: - type: index @@ -83,7 +84,6 @@ field_type: concat: true - class: solr.RemoveDuplicatesTokenFilterFactory - storeOffsetsWithPositions: true unstemmed_field_type: null spellcheck_field_type: null collated_field_type: null diff --git a/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml index fac2b30fe..1acd29194 100644 --- a/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml @@ -58,9 +58,9 @@ field_type: filters: - class: solr.SynonymFilterFactory + ignoreCase: true synonyms: synonyms_und.txt expand: true - ignoreCase: true - class: solr.StopFilterFactory ignoreCase: true @@ -190,8 +190,6 @@ solr_configs: text_files: stopwords: | - synonyms: | - drupal, durpal protwords: | accents: | @@ -343,3 +341,5 @@ text_files: "\uFB05" => "st" # st => st "\uFB06" => "st" + synonyms: | + drupal, durpal diff --git a/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml index 64bf7087f..fe389e322 100644 --- a/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml @@ -60,9 +60,9 @@ field_type: filters: - class: solr.SynonymGraphFilterFactory + ignoreCase: true synonyms: synonyms_und.txt expand: true - ignoreCase: true - class: solr.StopFilterFactory ignoreCase: true @@ -192,8 +192,6 @@ solr_configs: text_files: stopwords: | - synonyms: | - drupal, durpal protwords: | accents: | @@ -345,3 +343,5 @@ text_files: "\uFB05" => "st" # st => st "\uFB06" => "st" + synonyms: | + drupal, durpal From 384d8568ef9888456ea6e57a6d23709f8ba215ca Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Tue, 24 Oct 2023 12:38:35 -0300 Subject: [PATCH 2/3] Restore pgsql and sqlite. --- config/sync/core.extension.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 9dd016bcb..2424bbead 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -90,6 +90,7 @@ module: path: 0 path_alias: 0 pdf: 0 + pgsql: 0 prepopulate: 0 rdf: 0 responsive_image: 0 @@ -99,6 +100,7 @@ module: search_api_solr: 0 serialization: 0 shortcut: 0 + sqlite: 0 syslog: 0 system: 0 taxonomy: 0 From 0be9b84ed267390192dee4dc36f7ad6712b9540a Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Tue, 24 Oct 2023 12:40:57 -0300 Subject: [PATCH 3/3] Remove override warn. --- composer.json | 1 - composer.lock | 46 +--------------------------------------------- 2 files changed, 1 insertion(+), 46 deletions(-) diff --git a/composer.json b/composer.json index 430cce3e4..b448ecaa6 100755 --- a/composer.json +++ b/composer.json @@ -36,7 +36,6 @@ "drupal/bibcite": "^2.0@beta", "drupal/citation_select": "^1.0@beta", "drupal/coi": "^4.0", - "drupal/config_override_warn": "^1.4", "drupal/config_update": "^2.0@alpha", "drupal/context": "^5@RC", "drupal/controlled_access_terms": "^2", diff --git a/composer.lock b/composer.lock index 71fa4a36e..25f621af9 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": "79d6e506b61dc633692a247812296960", + "content-hash": "0db3582c1e59ecbc37162c1048ca9e5f", "packages": [ { "name": "academicpuma/citeproc-php", @@ -1958,50 +1958,6 @@ "issues": "https://github.com/dpi/config_override_core_fields/issues" } }, - { - "name": "drupal/config_override_warn", - "version": "1.4.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/config_override_warn.git", - "reference": "8.x-1.4" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_override_warn-8.x-1.4.zip", - "reference": "8.x-1.4", - "shasum": "d8f7eb24769bf58bda6de882a015ea288ea5643c" - }, - "require": { - "drupal/core": "^9 || ^10" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "8.x-1.4", - "datestamp": "1680829138", - "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": "Dave Reid", - "homepage": "https://www.drupal.org/user/53892" - } - ], - "description": "Provide a warning message on configuration forms when any values on the form are possibly being overridden.", - "homepage": "https://www.drupal.org/project/config_override_warn", - "support": { - "source": "https://git.drupalcode.org/project/config_override_warn" - } - }, { "name": "drupal/config_update", "version": "2.0.0-alpha3",