From 74ad92925b4ba8a84e5f321a4a93180d5e321f75 Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Wed, 29 Jul 2026 11:38:19 +0300 Subject: [PATCH 1/4] Drupal 11 compatibility --- CHANGELOG.md | 1 + composer.json | 4 ++-- os2web_key.info.yml | 2 +- src/Plugin/KeyProvider/AzureKeyVaultKeyProvider.php | 2 +- src/Plugin/KeyProvider/VaultKeyProvider.php | 6 +++--- src/Plugin/KeyType/CertificateKeyType.php | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c760f10..54d2955 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +* Drupal 11 compatibility * [PR-6](https://github.com/OS2web/os2web_key/pull/6) * Add missing dependency on Drupal [key](https://github.com/OS2web/os2web_key/pull/6) * Updates GitHub Actions diff --git a/composer.json b/composer.json index 013a5c7..1a36a68 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "require": { "php": "^8.1", "ext-openssl": "*", - "drupal/core": "^9 || ^10", + "drupal/core": "^9 || ^10 || ^11", "drupal/key": "^1.17", "itk-dev/serviceplatformen": "^1.6", "itk-dev/vault": "^0.1" @@ -20,7 +20,7 @@ "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^1.0", "drupal/coder": "^8.3", - "drupal/core-dev": "^9 || ^10", + "drupal/core-dev": "^9 || ^10 || ^11", "ergebnis/composer-normalize": "^2.42", "mglaman/phpstan-drupal": "^1.2", "phpstan/extension-installer": "^1.3", diff --git a/os2web_key.info.yml b/os2web_key.info.yml index c483f76..5e28b98 100644 --- a/os2web_key.info.yml +++ b/os2web_key.info.yml @@ -2,6 +2,6 @@ name: 'OS2Web key' type: module description: 'Key stuff for OS2Web' package: 'OS2web' -core_version_requirement: ^9 || ^10 +core_version_requirement: ^9 || ^10 || ^11 dependencies: - 'key:key' diff --git a/src/Plugin/KeyProvider/AzureKeyVaultKeyProvider.php b/src/Plugin/KeyProvider/AzureKeyVaultKeyProvider.php index f4fe28a..fa69b45 100644 --- a/src/Plugin/KeyProvider/AzureKeyVaultKeyProvider.php +++ b/src/Plugin/KeyProvider/AzureKeyVaultKeyProvider.php @@ -54,7 +54,7 @@ public function __construct( array $configuration, string $plugin_id, $plugin_definition, - private readonly LoggerInterface $logger, + protected readonly LoggerInterface $logger, ) { parent::__construct($configuration, $plugin_id, $plugin_definition); } diff --git a/src/Plugin/KeyProvider/VaultKeyProvider.php b/src/Plugin/KeyProvider/VaultKeyProvider.php index c71c919..7ccec55 100644 --- a/src/Plugin/KeyProvider/VaultKeyProvider.php +++ b/src/Plugin/KeyProvider/VaultKeyProvider.php @@ -61,9 +61,9 @@ public function __construct( $plugin_id, $plugin_definition, LoggerChannelInterface $logger, - private readonly ClientInterface $httpClient, - private readonly CacheInterface $cache, - private readonly KeyHelper $keyHelper, + protected readonly ClientInterface $httpClient, + protected readonly CacheInterface $cache, + protected readonly KeyHelper $keyHelper, ) { $this->setLogger($logger); parent::__construct($configuration, $plugin_id, $plugin_definition); diff --git a/src/Plugin/KeyType/CertificateKeyType.php b/src/Plugin/KeyType/CertificateKeyType.php index 865c1c6..81029c4 100644 --- a/src/Plugin/KeyType/CertificateKeyType.php +++ b/src/Plugin/KeyType/CertificateKeyType.php @@ -43,7 +43,7 @@ public function __construct( array $configuration, $plugin_id, $plugin_definition, - private readonly KeyHelper $certificateHelper, + protected readonly KeyHelper $certificateHelper, ) { parent::__construct($configuration, $plugin_id, $plugin_definition); } From e0df99d140b13fa23a2e51788bca5d76e5d45c6e Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Wed, 29 Jul 2026 11:40:37 +0300 Subject: [PATCH 2/4] Adding PR link to changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54d2955..5575e4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -* Drupal 11 compatibility +* [PR-7](https://github.com/OS2web/os2web_key/pull/7) + Drupal 11 compatibility * [PR-6](https://github.com/OS2web/os2web_key/pull/6) * Add missing dependency on Drupal [key](https://github.com/OS2web/os2web_key/pull/6) * Updates GitHub Actions From fada4e085a5bd93fd15e778ae101ba2c729bdbc3 Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Fri, 31 Jul 2026 12:48:40 +0300 Subject: [PATCH 3/4] Adding serviceplatformen D11 support --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1a36a68..61ab1a6 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "ext-openssl": "*", "drupal/core": "^9 || ^10 || ^11", "drupal/key": "^1.17", - "itk-dev/serviceplatformen": "^1.6", + "itk-dev/serviceplatformen": "^1.6 || dev-f/drupal11", "itk-dev/vault": "^0.1" }, "require-dev": { From e89005e1eb1b8017ee5ccaabe1982050d68b24a5 Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Fri, 14 Aug 2026 18:33:41 +0300 Subject: [PATCH 4/4] Reseting serviceplatform dependancy --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 61ab1a6..1a36a68 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "ext-openssl": "*", "drupal/core": "^9 || ^10 || ^11", "drupal/key": "^1.17", - "itk-dev/serviceplatformen": "^1.6 || dev-f/drupal11", + "itk-dev/serviceplatformen": "^1.6", "itk-dev/vault": "^0.1" }, "require-dev": {