From 22d5d4206364f3cfe29c48296f2f12731cb553e4 Mon Sep 17 00:00:00 2001 From: Smahel Jaromir Date: Thu, 21 May 2026 13:59:24 +0000 Subject: [PATCH 1/3] convivial-demo-46472: Update composer packages (Drupal Core to 11.3.10) and remove abandoned oomphinc package. Mirrored from (c-46472). --- composer.json | 4 +--- config/install/pathauto.pattern.article.yml | 3 ++- config/install/pathauto.pattern.event.yml | 3 ++- config/install/pathauto.pattern.person.yml | 3 ++- config/install/pathauto.pattern.place.yml | 3 ++- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 50a899ed..c645b76d 100644 --- a/composer.json +++ b/composer.json @@ -113,8 +113,7 @@ "npm-asset/jarallax": "^1.12.4", "npm-asset/jquery-ui-touch-punch": "^0.2.3", "npm-asset/scrollreveal": "^4.0.7", - "npm-asset/videojs-background": "^1.0", - "oomphinc/composer-installers-extender": "^2.0" + "npm-asset/videojs-background": "^1.0" }, "require-dev": { "behat/mink": "^1.11", @@ -147,7 +146,6 @@ "cweagans/composer-patches": true, "dealerdirect/phpcodesniffer-composer-installer": true, "drupal/core-composer-scaffold": true, - "oomphinc/composer-installers-extender": true, "phpro/grumphp": true, "phpstan/extension-installer": true }, diff --git a/config/install/pathauto.pattern.article.yml b/config/install/pathauto.pattern.article.yml index 13139f2c..d2e4d835 100644 --- a/config/install/pathauto.pattern.article.yml +++ b/config/install/pathauto.pattern.article.yml @@ -1,6 +1,8 @@ langcode: en status: true dependencies: + config: + - node.type.article module: - node id: article @@ -11,7 +13,6 @@ selection_criteria: 9429dac5-e33c-4f4c-bd10-03b49fe9c5f8: id: 'entity_bundle:node' negate: false - uuid: 9429dac5-e33c-4f4c-bd10-03b49fe9c5f8 context_mapping: node: node bundles: diff --git a/config/install/pathauto.pattern.event.yml b/config/install/pathauto.pattern.event.yml index 0c0a06b2..0cd5435a 100644 --- a/config/install/pathauto.pattern.event.yml +++ b/config/install/pathauto.pattern.event.yml @@ -1,6 +1,8 @@ langcode: en status: true dependencies: + config: + - node.type.event module: - node id: event @@ -11,7 +13,6 @@ selection_criteria: 8db7a319-41a5-4f2c-9cca-bcb6ce3404d5: id: 'entity_bundle:node' negate: false - uuid: 8db7a319-41a5-4f2c-9cca-bcb6ce3404d5 context_mapping: node: node bundles: diff --git a/config/install/pathauto.pattern.person.yml b/config/install/pathauto.pattern.person.yml index 45d0cbb6..f91ad19d 100644 --- a/config/install/pathauto.pattern.person.yml +++ b/config/install/pathauto.pattern.person.yml @@ -1,6 +1,8 @@ langcode: en status: true dependencies: + config: + - node.type.person module: - node id: person @@ -11,7 +13,6 @@ selection_criteria: 0d0ee4c9-19cd-44fd-b182-b108345b89c4: id: 'entity_bundle:node' negate: false - uuid: 0d0ee4c9-19cd-44fd-b182-b108345b89c4 context_mapping: node: node bundles: diff --git a/config/install/pathauto.pattern.place.yml b/config/install/pathauto.pattern.place.yml index 1b5a03cd..4b1678bd 100644 --- a/config/install/pathauto.pattern.place.yml +++ b/config/install/pathauto.pattern.place.yml @@ -1,6 +1,8 @@ langcode: en status: true dependencies: + config: + - node.type.place module: - node id: place @@ -11,7 +13,6 @@ selection_criteria: 22b85b39-bf4f-427f-bcfe-97cb8db06e21: id: 'entity_bundle:node' negate: false - uuid: 22b85b39-bf4f-427f-bcfe-97cb8db06e21 context_mapping: node: node bundles: From 0dd5f7fb505810fd7d39fb2acc015cf2002743be Mon Sep 17 00:00:00 2001 From: Radim Klaska Date: Thu, 28 May 2026 01:02:16 +0000 Subject: [PATCH 2/3] convivial-demo-46472: Add explicit installer-paths to convivial profile composer.json. Restores deterministic install layout for the morpht/convivial mirror repo CI, where this composer.json becomes root after mirror_profile.yml runs. Without oomphinc/composer-installers-extender (removed earlier in this PR), drupal/core was landing somewhere drupal-check couldn't reach from modules/custom, breaking the build. No effect inside convivial-demo since the top-level composer.json's installer-paths take precedence. Mirrored from (c-46472). --- composer.json | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/composer.json b/composer.json index c645b76d..5751ec88 100644 --- a/composer.json +++ b/composer.json @@ -157,6 +157,39 @@ "extra": { "composer-exit-on-patch-failure": true, "enable-patching": true, + "drupal-scaffold": { + "locations": { + "web-root": "./" + } + }, + "installer-paths": { + "core": [ + "type:drupal-core" + ], + "libraries/{$name}": [ + "type:drupal-library", + "type:bower-asset", + "type:npm-asset" + ], + "modules/contrib/{$name}": [ + "type:drupal-module" + ], + "profiles/contrib/{$name}": [ + "type:drupal-profile" + ], + "themes/contrib/{$name}": [ + "type:drupal-theme" + ], + "modules/custom/{$name}": [ + "type:drupal-custom-module" + ], + "themes/custom/{$name}": [ + "type:drupal-custom-theme" + ], + "drush/Commands/contrib/{$name}": [ + "type:drupal-drush" + ] + }, "patches": { "drupal/core": { "2309585 - There should be no output of default formatter for empty text field when summary has content": "https://www.drupal.org/files/issues/2018-07-19/empty_text_formatter_for_empty_fields-2309585-13.patch", From e0811acf932811f249b15f4c7917e16585e8f7b9 Mon Sep 17 00:00:00 2001 From: Radim Klaska Date: Thu, 28 May 2026 01:34:46 +0000 Subject: [PATCH 3/3] convivial-demo-46472: Restore oomphinc to fix convivial mirror CI; tell composer audit to ignore abandoned packages. Replaces the installer-paths approach (cca4faec) which only fixed drupal-check and then broke Drush bootstrap further along the convivial repo's CI ("Setup Application" step). oomphinc/composer-installers-extender is what registers drupal-core's install location implicitly for the convivial profile when its composer.json becomes root in the mirror repo. To keep oomphinc without breaking GrumPHP's securitychecker_composeraudit, this commit: * re-adds oomphinc/composer-installers-extender to web/profiles/custom/convivial/composer.json (require + allow-plugins) * re-adds the matching allow-plugins entry in the top-level composer.json * configures securitychecker_composeraudit with abandoned: ignore in both grumphp.yml files * bumps composer to 2.8.13 (in .lando.yml and the CI workflow) so the --abandoned flag is available * refreshes composer.lock with oomphinc back The installer-paths and drupal-scaffold blocks added in cca4faec to the profile composer.json are removed. Mirrored from (c-46472). --- composer.json | 37 +++---------------------------------- grumphp.yml | 1 + 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/composer.json b/composer.json index 5751ec88..50a899ed 100644 --- a/composer.json +++ b/composer.json @@ -113,7 +113,8 @@ "npm-asset/jarallax": "^1.12.4", "npm-asset/jquery-ui-touch-punch": "^0.2.3", "npm-asset/scrollreveal": "^4.0.7", - "npm-asset/videojs-background": "^1.0" + "npm-asset/videojs-background": "^1.0", + "oomphinc/composer-installers-extender": "^2.0" }, "require-dev": { "behat/mink": "^1.11", @@ -146,6 +147,7 @@ "cweagans/composer-patches": true, "dealerdirect/phpcodesniffer-composer-installer": true, "drupal/core-composer-scaffold": true, + "oomphinc/composer-installers-extender": true, "phpro/grumphp": true, "phpstan/extension-installer": true }, @@ -157,39 +159,6 @@ "extra": { "composer-exit-on-patch-failure": true, "enable-patching": true, - "drupal-scaffold": { - "locations": { - "web-root": "./" - } - }, - "installer-paths": { - "core": [ - "type:drupal-core" - ], - "libraries/{$name}": [ - "type:drupal-library", - "type:bower-asset", - "type:npm-asset" - ], - "modules/contrib/{$name}": [ - "type:drupal-module" - ], - "profiles/contrib/{$name}": [ - "type:drupal-profile" - ], - "themes/contrib/{$name}": [ - "type:drupal-theme" - ], - "modules/custom/{$name}": [ - "type:drupal-custom-module" - ], - "themes/custom/{$name}": [ - "type:drupal-custom-theme" - ], - "drush/Commands/contrib/{$name}": [ - "type:drupal-drush" - ] - }, "patches": { "drupal/core": { "2309585 - There should be no output of default formatter for empty text field when summary has content": "https://www.drupal.org/files/issues/2018-07-19/empty_text_formatter_for_empty_fields-2309585-13.patch", diff --git a/grumphp.yml b/grumphp.yml index bdccaa12..3256dc95 100644 --- a/grumphp.yml +++ b/grumphp.yml @@ -35,6 +35,7 @@ grumphp: triggered_by: - php securitychecker_composeraudit: + abandoned: ignore format: null locked: true no_dev: false