Merge pull request #749 from UN-OCHA/develop

Deploy 17/04/24

.gitattributes

@@ -42,6 +42,9 @@
 *.xml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.yml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 
+# PHPStan's baseline uses tabs instead of spaces.
+core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tabwidth=2 diff=php linguist-language=php
+
 # Define binary file attributes.
 # - Do not treat them as text.
 # - Include binary diff in patches instead of "binary files differ."

.github/workflows/composer-update.yml

@@ -15,7 +15,6 @@ jobs:
       with:
         github_access_token: ${{ secrets.PAT }}
         patch_branch: ${{ github.ref_name }}
-        patch_packages: 'drupal/*'
         patch_maintainers: ${{ secrets.DRUPAL_MAINTAINERS }}
         slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
         slack_channel_name: ${{ secrets.SLACK_CHANNEL }}

PATCHES/amazon_ses-3417090-cron-queue-14.patch

@@ -0,0 +1,18 @@
+diff --git a/src/Plugin/QueueWorker/AmazonSesMailQueue.php b/src/Plugin/QueueWorker/AmazonSesMailQueue.php
+index dc410504566451d20aec939de6953e6d1a6e9be9..fdc7af32ac6634c51283fb38f0227530a1772735 100644
+--- a/src/Plugin/QueueWorker/AmazonSesMailQueue.php
++++ b/src/Plugin/QueueWorker/AmazonSesMailQueue.php
+@@ -29,7 +29,12 @@ class AmazonSesMailQueue extends QueueWorkerBase implements ContainerFactoryPlug
+       $plugin_definition
+     );
+
+-    $instance->setHandler($container->get('amazon_ses.handler'));
++    // Only set the handler if queueing is enabled to avoid an error when
++    // trying to run without config.
++    $enabled = \Drupal::config('amazon_ses.settings')->get('queue');
++    if ($enabled) {
++      $instance->setHandler($container->get('amazon_ses.handler'));
++    }
+
+     return $instance;
+   }

composer.json

@@ -32,11 +32,12 @@
     ],
     "require": {
         "php": "8.*",
-        "composer/installers": "^1.9",
+        "composer/installers": "^2",
         "cweagans/composer-patches": "^1.7",
         "drupal/address": "^1.9",
         "drupal/admin_denied": "^2.0",
-        "drupal/amazon_ses": "^3.0",
+        "drupal/amazon_ses": "^3",
+        "drupal/aws": "dev-2.0.x",
         "drupal/components": "^3.0@beta",
         "drupal/config_filter": "^2.4",
         "drupal/config_split": "^2.0.0-rc4",