Drupal 11 compatibility

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* [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

composer.json

@@ -12,15 +12,15 @@
     "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"
     },
     "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",

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'

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);
   }

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);

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);
   }