From 9b9d644d730da0c14f879eba99f4fcf21717f6dc Mon Sep 17 00:00:00 2001 From: lazysoundsystem Date: Thu, 23 Jan 2025 12:19:33 +0100 Subject: [PATCH 1/2] updates: weekly updates Refs: OPS-11278 --- .../amazon_ses-3417090-cron-queue-14.patch | 18 -- PATCHES/amazon_ses-cron-queue-3417090-5.patch | 23 +++ composer.lock | 161 ++++++++++-------- composer.patches.json | 2 +- 4 files changed, 110 insertions(+), 94 deletions(-) delete mode 100644 PATCHES/amazon_ses-3417090-cron-queue-14.patch create mode 100644 PATCHES/amazon_ses-cron-queue-3417090-5.patch diff --git a/PATCHES/amazon_ses-3417090-cron-queue-14.patch b/PATCHES/amazon_ses-3417090-cron-queue-14.patch deleted file mode 100644 index 627b8177..00000000 --- a/PATCHES/amazon_ses-3417090-cron-queue-14.patch +++ /dev/null @@ -1,18 +0,0 @@ -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; - } diff --git a/PATCHES/amazon_ses-cron-queue-3417090-5.patch b/PATCHES/amazon_ses-cron-queue-3417090-5.patch new file mode 100644 index 00000000..b1440412 --- /dev/null +++ b/PATCHES/amazon_ses-cron-queue-3417090-5.patch @@ -0,0 +1,23 @@ +diff --git a/amazon_ses.module b/amazon_ses.module +new file mode 100644 +index 0000000..b778644 +--- /dev/null ++++ b/amazon_ses.module +@@ -0,0 +1,17 @@ ++get('queue'); ++ ++ if (!$enabled && isset($queues['amazon_ses_mail_queue']['cron'])) { ++ unset($queues['amazon_ses_mail_queue']['cron']); ++ } ++} diff --git a/composer.lock b/composer.lock index 8f1d9eb8..7ddcd402 100644 --- a/composer.lock +++ b/composer.lock @@ -118,16 +118,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.337.0", + "version": "3.338.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "7e40cecb3ce66749bbd5eaa9f370de48c16acd6c" + "reference": "b456832a41f4638ad8d117cedd6efaed4017e651" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7e40cecb3ce66749bbd5eaa9f370de48c16acd6c", - "reference": "7e40cecb3ce66749bbd5eaa9f370de48c16acd6c", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b456832a41f4638ad8d117cedd6efaed4017e651", + "reference": "b456832a41f4638ad8d117cedd6efaed4017e651", "shasum": "" }, "require": { @@ -135,31 +135,31 @@ "ext-json": "*", "ext-pcre": "*", "ext-simplexml": "*", - "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5", - "guzzlehttp/promises": "^1.4.0 || ^2.0", - "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", - "mtdowling/jmespath.php": "^2.6", - "php": ">=7.2.5", - "psr/http-message": "^1.0 || ^2.0" + "guzzlehttp/guzzle": "^7.4.5", + "guzzlehttp/promises": "^2.0", + "guzzlehttp/psr7": "^2.4.5", + "mtdowling/jmespath.php": "^2.8.0", + "php": ">=8.1", + "psr/http-message": "^2.0" }, "require-dev": { "andrewsville/php-token-reflection": "^1.4", "aws/aws-php-sns-message-validator": "~1.0", "behat/behat": "~3.0", - "composer/composer": "^1.10.22", + "composer/composer": "^2.7.8", "dms/phpunit-arraysubset-asserts": "^0.4.0", "doctrine/cache": "~1.4", "ext-dom": "*", "ext-openssl": "*", "ext-pcntl": "*", "ext-sockets": "*", - "nette/neon": "^2.3", "paragonie/random_compat": ">= 2", "phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5", - "psr/cache": "^1.0 || ^2.0 || ^3.0", - "psr/simple-cache": "^1.0 || ^2.0 || ^3.0", - "sebastian/comparator": "^1.2.3 || ^4.0", - "yoast/phpunit-polyfills": "^1.0" + "psr/cache": "^2.0 || ^3.0", + "psr/simple-cache": "^2.0 || ^3.0", + "sebastian/comparator": "^1.2.3 || ^4.0 || ^5.0", + "symfony/filesystem": "^v6.4.0 || ^v7.1.0", + "yoast/phpunit-polyfills": "^2.0" }, "suggest": { "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications", @@ -208,11 +208,11 @@ "sdk" ], "support": { - "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", + "forum": "https://github.com/aws/aws-sdk-php/discussions", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.337.0" + "source": "https://github.com/aws/aws-sdk-php/tree/3.338.0" }, - "time": "2025-01-15T19:58:52+00:00" + "time": "2025-01-22T19:15:24+00:00" }, { "name": "bower-asset/dragula", @@ -1662,28 +1662,28 @@ }, { "name": "drupal/amazon_ses", - "version": "3.0.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/amazon_ses.git", - "reference": "3.0.1" + "reference": "3.1.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/amazon_ses-3.0.1.zip", - "reference": "3.0.1", - "shasum": "2dbb10219056e21f0bb60d37df5b459caea635e2" + "url": "https://ftp.drupal.org/files/projects/amazon_ses-3.1.0.zip", + "reference": "3.1.0", + "shasum": "0a598eee62c85d7ee8cbb55ad43ce00ece217bae" }, "require": { "aws/aws-sdk-php": "^3.54", "drupal/aws": "^2.0", - "drupal/core": "^9.1 || ^10" + "drupal/core": "^9.1 || ^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.1", - "datestamp": "1671308264", + "version": "3.1.0", + "datestamp": "1737386574", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2544,33 +2544,41 @@ }, { "name": "drupal/dashboards", - "version": "2.1.7", + "version": "2.1.10", "source": { "type": "git", "url": "https://git.drupalcode.org/project/dashboards.git", - "reference": "2.1.7" + "reference": "2.1.10" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/dashboards-2.1.7.zip", - "reference": "2.1.7", - "shasum": "e45de9cffd19640061ecad69adfa8450f0182ea5" + "url": "https://ftp.drupal.org/files/projects/dashboards-2.1.10.zip", + "reference": "2.1.10", + "shasum": "5b2df04b0138ea0d6213bb2df1b6636de9dcf6c7" }, "require": { - "drupal/core": "^9.4 || ^10", + "drupal/core": "^9.4 || ^10 || ^11", "laminas/laminas-feed": "^2.17" }, "require-dev": { + "drupal/layout_builder_restrictions": "*", "drupal/matomo": "*", "drupal/matomo_reporting_api": "*", "drupal/statistics": "*", "drupal/webform": "*" }, + "suggest": { + "drupal/layout_builder_restrictions": "Manage which fields & layouts are available in Layout Builder.", + "drupal/matomo": "Reports site visitor analytics to a Matomo instance.", + "drupal/matomo_reporting_api": "Allows to retrieve reports from the Matomo API.", + "drupal/statistics": "Logs how many times content is viewed.", + "drupal/webform": "Enables the creation of webforms and questionnaires." + }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.7", - "datestamp": "1710850211", + "version": "2.1.10", + "datestamp": "1737573144", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2583,8 +2591,12 @@ ], "authors": [ { - "name": "Erik Seifert", + "name": "erik seifert", "homepage": "https://www.drupal.org/user/161429" + }, + { + "name": "leymannx", + "homepage": "https://www.drupal.org/user/2482808" } ], "description": "Dashboards based on Layout Builder.", @@ -4403,7 +4415,7 @@ "shasum": "fc8ea60619b6b4682bade340e13fb4565d3a7e0c" }, "require": { - "drupal/core": "^8 || ^9 || ^10 || ^11 || ^12" + "drupal/core": "^10" }, "type": "drupal-module", "extra": { @@ -5098,17 +5110,17 @@ }, { "name": "drupal/redirect", - "version": "1.10.0", + "version": "1.11.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/redirect.git", - "reference": "8.x-1.10" + "reference": "8.x-1.11" }, "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.11.zip", + "reference": "8.x-1.11", + "shasum": "7df8b3524bbde07d254216039636947a689140ef" }, "require": { "drupal/core": "^9.2 || ^10 || ^11" @@ -5116,8 +5128,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.10", - "datestamp": "1723277641", + "version": "8.x-1.11", + "datestamp": "1737382886", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5796,7 +5808,7 @@ "shasum": "4aa9b119c9c992fd9930fa50f97cd89959c3bafb" }, "require": { - "drupal/core": "^8 || ^9 || ^10 || ^11 || ^12" + "drupal/core": "^10" }, "type": "drupal-module", "extra": { @@ -12234,16 +12246,16 @@ }, { "name": "unocha/common_design", - "version": "v9.4.4", + "version": "v9.5.0", "source": { "type": "git", "url": "https://github.com/UN-OCHA/common_design.git", - "reference": "f11b39f2faf9eabcd88ec10a120e465897116e7d" + "reference": "519a486e05a8f9a749b9717c91be91202063de9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/f11b39f2faf9eabcd88ec10a120e465897116e7d", - "reference": "f11b39f2faf9eabcd88ec10a120e465897116e7d", + "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/519a486e05a8f9a749b9717c91be91202063de9a", + "reference": "519a486e05a8f9a749b9717c91be91202063de9a", "shasum": "" }, "require": { @@ -12255,12 +12267,12 @@ "license": [ "GPL-2.0-only" ], - "description": "OCHA Common Design base theme for Drupal 9+", + "description": "OCHA Common Design base theme for Drupal", "support": { "issues": "https://github.com/UN-OCHA/common_design/issues", - "source": "https://github.com/UN-OCHA/common_design/tree/v9.4.4" + "source": "https://github.com/UN-OCHA/common_design/tree/v9.5.0" }, - "time": "2024-11-18T09:15:05+00:00" + "time": "2025-01-22T11:58:45+00:00" }, { "name": "unocha/gtm_barebones", @@ -12291,20 +12303,19 @@ }, { "name": "unocha/ocha_monitoring", - "version": "1.0.18", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/UN-OCHA/ocha_monitoring.git", - "reference": "6c8d8a803da62c1f9581c1a8a90fc17501ba6394" + "reference": "187d453123403b2ffca351d5810dc4a2ef3d8919" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/UN-OCHA/ocha_monitoring/zipball/6c8d8a803da62c1f9581c1a8a90fc17501ba6394", - "reference": "6c8d8a803da62c1f9581c1a8a90fc17501ba6394", + "url": "https://api.github.com/repos/UN-OCHA/ocha_monitoring/zipball/187d453123403b2ffca351d5810dc4a2ef3d8919", + "reference": "187d453123403b2ffca351d5810dc4a2ef3d8919", "shasum": "" }, "require": { - "drupal/core": "^10", "drupal/monitoring": "^1" }, "type": "drupal-module", @@ -12315,9 +12326,9 @@ "description": "UNOCHA Monitoring", "support": { "issues": "https://github.com/UN-OCHA/ocha_monitoring/issues", - "source": "https://github.com/UN-OCHA/ocha_monitoring/tree/1.0.18" + "source": "https://github.com/UN-OCHA/ocha_monitoring/tree/1.1.0" }, - "time": "2024-07-18T14:02:43+00:00" + "time": "2025-01-20T12:21:09+00:00" }, { "name": "unocha/ocha_search", @@ -12859,16 +12870,16 @@ }, { "name": "composer/composer", - "version": "2.8.4", + "version": "2.8.5", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "112e37d1dca22b3fdb81cf3524ab4994f47fdb8c" + "reference": "ae208dc1e182bd45d99fcecb956501da212454a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/112e37d1dca22b3fdb81cf3524ab4994f47fdb8c", - "reference": "112e37d1dca22b3fdb81cf3524ab4994f47fdb8c", + "url": "https://api.github.com/repos/composer/composer/zipball/ae208dc1e182bd45d99fcecb956501da212454a1", + "reference": "ae208dc1e182bd45d99fcecb956501da212454a1", "shasum": "" }, "require": { @@ -12953,7 +12964,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.8.4" + "source": "https://github.com/composer/composer/tree/2.8.5" }, "funding": [ { @@ -12969,7 +12980,7 @@ "type": "tidelift" } ], - "time": "2024-12-11T10:57:47+00:00" + "time": "2025-01-21T14:23:40+00:00" }, { "name": "composer/metadata-minifier", @@ -13732,16 +13743,16 @@ }, { "name": "drupal/coder", - "version": "8.3.27", + "version": "8.3.28", "source": { "type": "git", "url": "https://github.com/pfrenssen/coder.git", - "reference": "04a4563b82c419e43cc58393a78b21c44fcc29e2" + "reference": "d18eeb133f7da766f0341734aa983d05f2b317fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pfrenssen/coder/zipball/04a4563b82c419e43cc58393a78b21c44fcc29e2", - "reference": "04a4563b82c419e43cc58393a78b21c44fcc29e2", + "url": "https://api.github.com/repos/pfrenssen/coder/zipball/d18eeb133f7da766f0341734aa983d05f2b317fd", + "reference": "d18eeb133f7da766f0341734aa983d05f2b317fd", "shasum": "" }, "require": { @@ -13779,7 +13790,7 @@ "issues": "https://www.drupal.org/project/issues/coder", "source": "https://www.drupal.org/project/coder" }, - "time": "2025-01-06T09:46:24+00:00" + "time": "2025-01-18T17:05:53+00:00" }, { "name": "drupal/config_inspector", @@ -16264,16 +16275,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.15", + "version": "1.12.16", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1" + "reference": "e0bb5cb78545aae631220735aa706eac633a6be9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c91d4e8bc056f46cf653656e6f71004b254574d1", - "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e0bb5cb78545aae631220735aa706eac633a6be9", + "reference": "e0bb5cb78545aae631220735aa706eac633a6be9", "shasum": "" }, "require": { @@ -16318,7 +16329,7 @@ "type": "github" } ], - "time": "2025-01-05T16:40:22+00:00" + "time": "2025-01-21T14:50:05+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", diff --git a/composer.patches.json b/composer.patches.json index dd6a065c..a1fd6690 100644 --- a/composer.patches.json +++ b/composer.patches.json @@ -1,7 +1,7 @@ { "patches": { "drupal/amazon_ses": { - "Cron fails on amazon_ses when not configured": "PATCHES/amazon_ses-3417090-cron-queue-14.patch" + "Cron fails on amazon_ses when not configured": "PATCHES/amazon_ses-cron-queue-3417090-5.patch" }, "drupal/core" : { "https://www.drupal.org/project/drupal/issues/3143617": "https://www.drupal.org/files/issues/2020-07-07/3143617-28_0.patch", From 4ce663e267f765cd0ce2151de00cb453577a3e80 Mon Sep 17 00:00:00 2001 From: lazysoundsystem Date: Tue, 28 Jan 2025 09:09:52 -0300 Subject: [PATCH 2/2] updates: fix hook name in patch Refs: OPS-11278 --- ...ue-3417090-5.patch => amazon_ses-cron-queue-3417090-8.patch} | 2 +- composer.patches.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename PATCHES/{amazon_ses-cron-queue-3417090-5.patch => amazon_ses-cron-queue-3417090-8.patch} (89%) diff --git a/PATCHES/amazon_ses-cron-queue-3417090-5.patch b/PATCHES/amazon_ses-cron-queue-3417090-8.patch similarity index 89% rename from PATCHES/amazon_ses-cron-queue-3417090-5.patch rename to PATCHES/amazon_ses-cron-queue-3417090-8.patch index b1440412..93044ca9 100644 --- a/PATCHES/amazon_ses-cron-queue-3417090-5.patch +++ b/PATCHES/amazon_ses-cron-queue-3417090-8.patch @@ -14,7 +14,7 @@ index 0000000..b778644 +/** + * Implements hook_queue_info_alter(). + */ -+function amazon_ses_hook_queue_info_alter(&$queues) { ++function amazon_ses_queue_info_alter(&$queues) { + $enabled = \Drupal::config('amazon_ses.settings')->get('queue'); + + if (!$enabled && isset($queues['amazon_ses_mail_queue']['cron'])) { diff --git a/composer.patches.json b/composer.patches.json index a1fd6690..f2314027 100644 --- a/composer.patches.json +++ b/composer.patches.json @@ -1,7 +1,7 @@ { "patches": { "drupal/amazon_ses": { - "Cron fails on amazon_ses when not configured": "PATCHES/amazon_ses-cron-queue-3417090-5.patch" + "Cron fails on amazon_ses when not configured": "PATCHES/amazon_ses-cron-queue-3417090-8.patch" }, "drupal/core" : { "https://www.drupal.org/project/drupal/issues/3143617": "https://www.drupal.org/files/issues/2020-07-07/3143617-28_0.patch",