Merge branch 'feature/os2web_key' into feature/os2web_key-hashi-corp-vault

Author: jekuaitk

CHANGELOG.md

@@ -16,6 +16,12 @@ before starting to add changes. Use example [placed in the end of the page](#exa
   - Added support for `os2web_key` in Fasit handler.
     - Switched from saving settings in key value store to config, i.e
       the module needs to be reconfigured.
+- Removed modules ldap_auth, logging_alerts, maillog
+
+## [3.21.2] 2025-01-07
+
+- Adds missing `http-message-util` requirement and use statement.
+- Runs code-analysis on `os2forms_fbs_handler` module.
 
 ## [3.21.1] 2025-01-06
 
@@ -334,7 +340,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 - Security in case of vulnerabilities.
 ```
 
-[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.21.1...HEAD
+[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.21.2...HEAD
+[3.21.2]: https://github.com/OS2Forms/os2forms/compare/3.21.1...3.21.2
 [3.21.1]: https://github.com/OS2Forms/os2forms/compare/3.21.0...3.21.1
 [3.21.0]: https://github.com/OS2Forms/os2forms/compare/3.20.1...3.21.0
 [3.20.1]: https://github.com/OS2Forms/os2forms/compare/3.20.0...3.20.1

composer.json

@@ -11,6 +11,7 @@
         "dompdf/dompdf": "^2.0",
         "drupal/admin_toolbar": "^3.0",
         "drupal/advancedqueue": "^1.0",
+        "drupal/cache_control_override": "^1.1|^2.0",
         "drupal/clientside_validation": "^4.0",
         "drupal/coc_forms_auto_export": "^2.0@alpha",
         "drupal/config_entity_revisions": "dev-2.0.x",
@@ -19,14 +20,13 @@
         "drupal/entity_print": "^2.1",
         "drupal/eu_cookie_compliance": "^1.8",
         "drupal/events_logging": "^2.0@beta",
+        "drupal/gin": "^3.0-rc",
         "drupal/honeypot": "^2.0",
         "drupal/image_widget_crop": "^2.3",
         "drupal/ldap": "^4.2",
-        "drupal/ldap_auth": "^1.17",
         "drupal/leaflet": "^10.0",
         "drupal/leaflet_layers": "^1.1",
         "drupal/libraries": "^4.0",
-        "drupal/logging_alerts": "^2.0",
         "drupal/maestro": "^3.1",
         "drupal/mailsystem": "^4.1",
         "drupal/masquerade": "^2.0@RC",
@@ -53,6 +53,7 @@
         "drupal/webform_validation": "^2.0",
         "drupal/webform_views": "^5.0@alpha",
         "drupal/workflow_participants": "^3.0@RC",
+        "fig/http-message-util": "^1.1",
         "http-interop/http-factory-guzzle": "^1.0.0",
         "itk-dev/beskedfordeler-drupal": "^1.0",
         "itk-dev/serviceplatformen": "^1.5",
@@ -61,6 +62,7 @@
         "os2web/os2web_datalookup": "dev-feature/os2web_key as 2.0.0",
         "os2web/os2web_key": "^1.0",
         "os2web/os2web_nemlogin": "^1.0",
+        "os2web/os2web_simplesaml": "dev-master",
         "php-http/guzzle7-adapter": "^1.0",
         "phpoffice/phpword": "^0.18.2",
         "symfony/options-resolver": "^5.4 || ^6.0",
@@ -71,7 +73,6 @@
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
         "drupal/coder": "^8.3",
-        "drupal/maillog": "^1.0",
         "ergebnis/composer-normalize": "^2.42",
         "mglaman/phpstan-drupal": "^1.1",
         "phpstan/extension-installer": "^1.3",

modules/os2forms_dawa/src/Plugin/os2web/DataLookup/DatafordelerDataLookup.php

@@ -6,6 +6,7 @@
 use Drupal\Core\File\FileSystem;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\key\KeyRepository;
 use Drupal\key\KeyRepositoryInterface;
 use Drupal\os2forms_dawa\Entity\DatafordelerMatrikula;
 use Drupal\os2web_audit\Service\Logger;

modules/os2forms_digital_post/src/Helper/CertificateLocatorHelper.php

@@ -4,6 +4,7 @@
 
 use Drupal\os2forms_fbs_handler\Client\Model\Guardian;
 use Drupal\os2forms_fbs_handler\Client\Model\Patron;
+use Fig\Http\Message\RequestMethodInterface;
 use GuzzleHttp\Client;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -242,6 +243,8 @@ public function createGuardian(Patron $patron, Guardian $guardian): int {
    *
    * @throws \GuzzleHttp\Exception\GuzzleException
    * @throws \JsonException
+   *
+   * @phpstan-param array<mixed>|string $data
    */
   private function request(string $uri, array|string $data, string $method = Request::METHOD_POST): mixed {
     $url = rtrim($this->endpoint, '/\\');

modules/os2forms_fbs_handler/src/Client/FBS.php

@@ -22,6 +22,8 @@ public function __construct(
    *
    * @return array
    *   Array with field required by FBS calls.
+   *
+   * @phpstan-return array<string, string>
    */
   public function toArray(): array {
     return [

modules/os2forms_fbs_handler/src/Client/Model/Guardian.php

@@ -9,6 +9,10 @@ final class Patron {
 
   /**
    * Default constructor.
+   *
+   * @phpstan-param array<mixed>|null $notificationProtocols
+   * @phpstan-param array<mixed>|null $onHold
+   * @phpstan-param array<mixed>|null $emailAddresses
    */
   public function __construct(
     public readonly ?string $patronId = NULL,
@@ -35,6 +39,8 @@ public function __construct(
    *
    * @return array
    *   Array with field required by FBS calls.
+   *
+   * @phpstan-return array<string, string>
    */
   public function toArray(): array {
     return [

modules/os2forms_fbs_handler/src/Client/Model/Patron.php

@@ -35,6 +35,8 @@ final class FbsCreateUser extends JobTypeBase implements ContainerFactoryPluginI
 
   /**
    * {@inheritdoc}
+   *
+   * @phpstan-param array<mixed> $configuration
    */
   public function __construct(
     array $configuration,
@@ -50,6 +52,8 @@ public function __construct(
 
   /**
    * {@inheritdoc}
+   *
+   * @phpstan-param array<mixed> $configuration
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
     return new static(

modules/os2forms_fbs_handler/src/Plugin/AdvancedQueue/JobType/FbsCreateUser.php

@@ -45,6 +45,8 @@ final class FbsWebformHandler extends WebformHandlerBase {
 
   /**
    * Constructs an FbsWebformHandler object.
+   *
+   * @phpstan-param array<mixed> $configuration
    */
   public function __construct(
     array $configuration,
@@ -70,6 +72,8 @@ public function __construct(
 
   /**
    * {@inheritdoc}
+   *
+   * @phpstan-param array<mixed> $configuration
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
     return new static(
@@ -87,6 +91,10 @@ public static function create(ContainerInterface $container, array $configuratio
 
   /**
    * {@inheritdoc}
+   *
+   * @phpstan-param array<mixed> $form
+   *
+   * @phpstan-return array<mixed>
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state): array {
     if (is_null($this->getQueue())) {
@@ -143,6 +151,8 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
 
   /**
    * {@inheritdoc}
+   *
+   * @phpstan-param array<mixed> $form
    */
   public function submitConfigurationForm(array &$form, FormStateInterface $form_state): void {
     parent::submitConfigurationForm($form, $form_state);

modules/os2forms_fbs_handler/src/Plugin/WebformHandler/FbsWebformHandler.php

@@ -2,6 +2,7 @@ parameters:
   level: 6
   paths:
     - modules/os2forms_digital_post/
+    - modules/os2forms_fbs_handler/
   excludePaths:
     # @see https://github.com/mglaman/drupal-check/issues/261#issuecomment-1030141772/
     - vendor