From 9d54e8c5536347bca52af4d459fcb114dc76b97c Mon Sep 17 00:00:00 2001 From: bach Date: Tue, 14 Oct 2025 16:51:00 +0200 Subject: [PATCH] updated R contrib modules, role_expire upgrade --- composer.json | 2 +- composer.lock | 89 ++++++++++--------- config/sync/core.extension.yml | 1 + .../fr/views.view.commerce_cart_block.yml | 2 - config/sync/language/fr/views.view.files.yml | 1 + config/sync/role_expire.config.yml | 1 + 6 files changed, 53 insertions(+), 43 deletions(-) diff --git a/composer.json b/composer.json index d1fc9df8..90d0327d 100644 --- a/composer.json +++ b/composer.json @@ -128,7 +128,7 @@ "drupal/redis": "^1.5", "drupal/restui": "^1.16", "drupal/role_delegation": "^1.1", - "drupal/role_expire": "^3.0", + "drupal/role_expire": "^4.1", "drupal/rules": "^4.0", "drupal/search_api": "^1.19", "drupal/search_api_autocomplete": "^1.2", diff --git a/composer.lock b/composer.lock index 9c63e986..c79027f8 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": "58bd244ec4c2784483b7afd435f4fbf8", + "content-hash": "1aa60a51954e83bcb212720539df226f", "packages": [ { "name": "algolia/places", @@ -10361,26 +10361,26 @@ }, { "name": "drupal/redirect", - "version": "1.10.0", + "version": "1.12.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/redirect.git", - "reference": "8.x-1.10" + "reference": "8.x-1.12" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/redirect-8.x-1.10.zip", - "reference": "8.x-1.10", - "shasum": "9d72d7e0717dbdea3ab3306c5d6840da5bd3024c" + "url": "https://ftp.drupal.org/files/projects/redirect-8.x-1.12.zip", + "reference": "8.x-1.12", + "shasum": "1cdee11356a25b9f9a10329aec0eeb293e0023de" }, "require": { - "drupal/core": "^9.2 || ^10 || ^11" + "drupal/core": "^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.10", - "datestamp": "1723277641", + "version": "8.x-1.12", + "datestamp": "1756419163", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -10393,7 +10393,7 @@ ], "authors": [ { - "name": "Berdir", + "name": "berdir", "homepage": "https://www.drupal.org/user/214652" }, { @@ -10401,7 +10401,7 @@ "homepage": "https://www.drupal.org/user/53892" }, { - "name": "Kristen Pol", + "name": "kristen pol", "homepage": "https://www.drupal.org/user/8389" }, { @@ -10417,17 +10417,17 @@ }, { "name": "drupal/redis", - "version": "1.8.0", + "version": "1.10.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/redis.git", - "reference": "8.x-1.8" + "reference": "8.x-1.10" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/redis-8.x-1.8.zip", - "reference": "8.x-1.8", - "shasum": "6de73086d29de3b041594bae97c74401cbf05c3d" + "url": "https://ftp.drupal.org/files/projects/redis-8.x-1.10.zip", + "reference": "8.x-1.10", + "shasum": "c3a886bd2941f60ae17bd23fa255ee99f2581637" }, "require": { "drupal/core": "^9.3 || ^10 || ^11" @@ -10440,8 +10440,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.8", - "datestamp": "1723934771", + "version": "8.x-1.10", + "datestamp": "1754045876", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -10543,29 +10543,26 @@ }, { "name": "drupal/role_delegation", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/role_delegation.git", - "reference": "8.x-1.3" + "reference": "8.x-1.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/role_delegation-8.x-1.3.zip", - "reference": "8.x-1.3", - "shasum": "e03d9c82d509a2630750e50a3452bd70ca1c55a6" + "url": "https://ftp.drupal.org/files/projects/role_delegation-8.x-1.4.zip", + "reference": "8.x-1.4", + "shasum": "7637fb2506b134bc888c74d3dcfa79c8a0c207aa" }, "require": { "drupal/core": "^10.3 || ^11" }, - "require-dev": { - "drupal/action": "^0.2" - }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.3", - "datestamp": "1726236826", + "version": "8.x-1.4", + "datestamp": "1751012870", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -10586,6 +10583,10 @@ "name": "benjy", "homepage": "https://www.drupal.org/user/1852732" }, + { + "name": "dieterholvoet", + "homepage": "https://www.drupal.org/user/3567222" + }, { "name": "jeroent", "homepage": "https://www.drupal.org/user/2228934" @@ -10600,26 +10601,32 @@ }, { "name": "drupal/role_expire", - "version": "3.0.2", + "version": "4.1.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/role_expire.git", - "reference": "3.0.2" + "reference": "4.1.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/role_expire-3.0.2.zip", - "reference": "3.0.2", - "shasum": "cc8238a8ff3f7787977a8177093ef91d1e4f0a27" + "url": "https://ftp.drupal.org/files/projects/role_expire-4.1.1.zip", + "reference": "4.1.1", + "shasum": "60afeea2051ea5cf376bc3562058696388f9719f" }, "require": { - "drupal/core": "^8.8 || ^9 || ^10" + "drupal/core": "^10.2 || ^11" + }, + "require-dev": { + "drupal/rules": "*" + }, + "suggest": { + "drupal/rules": "Required for role_expire_rules submodule" }, "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.2", - "datestamp": "1699385445", + "version": "4.1.1", + "datestamp": "1730396658", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -10632,8 +10639,9 @@ ], "authors": [ { - "name": "rcodina", - "homepage": "https://www.drupal.org/user/2635031" + "name": "Roger Codina (rcodina)", + "homepage": "https://www.drupal.org/u/rcodina", + "role": "Maintainer" }, { "name": "stewsnooze", @@ -10641,9 +10649,10 @@ } ], "description": "Enables user roles to expire on given time and day.", - "homepage": "https://www.drupal.org/project/role_expire", + "homepage": "https://drupal.org/project/role_expire", "support": { - "source": "https://git.drupalcode.org/project/role_expire" + "source": "https://git.drupalcode.org/project/role_expire", + "issues": "https://drupal.org/project/issues/role_expire" } }, { diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index bf3f1c53..29279b79 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -174,6 +174,7 @@ module: restui: 0 role_delegation: 0 role_expire: 0 + role_expire_rules: 0 rules: 0 search_api: 0 search_api_db: 0 diff --git a/config/sync/language/fr/views.view.commerce_cart_block.yml b/config/sync/language/fr/views.view.commerce_cart_block.yml index 4c7d5cfa..f9379718 100644 --- a/config/sync/language/fr/views.view.commerce_cart_block.yml +++ b/config/sync/language/fr/views.view.commerce_cart_block.yml @@ -12,8 +12,6 @@ display: sort_desc_label: Desc fields: quantity: - alter: - text: '{{ quantity }} x' separator: ', ' title: separator: ', ' diff --git a/config/sync/language/fr/views.view.files.yml b/config/sync/language/fr/views.view.files.yml index a6af54c0..40c5f9c6 100644 --- a/config/sync/language/fr/views.view.files.yml +++ b/config/sync/language/fr/views.view.files.yml @@ -28,6 +28,7 @@ display: label: 'Utilisé dans' alter: path: 'admin/content/files/usage/{{ fid }}' + format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz pager: options: expose: diff --git a/config/sync/role_expire.config.yml b/config/sync/role_expire.config.yml index 8bf7a548..8f4da52d 100644 --- a/config/sync/role_expire.config.yml +++ b/config/sync/role_expire.config.yml @@ -4,3 +4,4 @@ role_expire_default_roles: '{"unverified":"0","free_user":"0","contact_company": role_expire_disabled_roles: '{"unverified":1,"free_user":1,"contact_company":1,"alpha_testeur":1,"student":0,"adherent":1,"translator":1,"admin_showroom":1,"admin":1,"root":1}' role_expire_default_duration_roles: student: '1 year' +role_expire_expiration_details_expanded: false