From c55f3cb2a9fdbe5fe44a29e08d853c56702b270b Mon Sep 17 00:00:00 2001 From: unocha-jenkins Date: Thu, 21 Mar 2024 06:37:58 +0000 Subject: [PATCH 1/9] chore: Update all outdated drupal/* packages. --- composer.lock | 150 ++++++++++++++++++++++++-------------------------- 1 file changed, 72 insertions(+), 78 deletions(-) diff --git a/composer.lock b/composer.lock index 9bd2bca..9091441 100644 --- a/composer.lock +++ b/composer.lock @@ -118,16 +118,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.300.17", + "version": "3.301.4", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "ddd93079be1646e7db727d078f4c5beee1ddb052" + "reference": "1d04b11a621eaceb389d2cfbd82bcdc423903796" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ddd93079be1646e7db727d078f4c5beee1ddb052", - "reference": "ddd93079be1646e7db727d078f4c5beee1ddb052", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1d04b11a621eaceb389d2cfbd82bcdc423903796", + "reference": "1d04b11a621eaceb389d2cfbd82bcdc423903796", "shasum": "" }, "require": { @@ -207,9 +207,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.300.17" + "source": "https://github.com/aws/aws-sdk-php/tree/3.301.4" }, - "time": "2024-03-13T18:08:32+00:00" + "time": "2024-03-20T18:16:55+00:00" }, { "name": "behat/mink", @@ -556,28 +556,28 @@ }, { "name": "composer/ca-bundle", - "version": "1.4.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "3ce240142f6d59b808dd65c1f52f7a1c252e6cfd" + "reference": "0c5ccfcfea312b5c5a190a21ac5cef93f74baf99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/3ce240142f6d59b808dd65c1f52f7a1c252e6cfd", - "reference": "3ce240142f6d59b808dd65c1f52f7a1c252e6cfd", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/0c5ccfcfea312b5c5a190a21ac5cef93f74baf99", + "reference": "0c5ccfcfea312b5c5a190a21ac5cef93f74baf99", "shasum": "" }, "require": { "ext-openssl": "*", "ext-pcre": "*", - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": "^7.2 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.55", + "phpstan/phpstan": "^1.10", "psr/log": "^1.0", "symfony/phpunit-bridge": "^4.2 || ^5", - "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" + "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", "extra": { @@ -612,7 +612,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.4.1" + "source": "https://github.com/composer/ca-bundle/tree/1.5.0" }, "funding": [ { @@ -628,20 +628,20 @@ "type": "tidelift" } ], - "time": "2024-02-23T10:16:52+00:00" + "time": "2024-03-15T14:00:32+00:00" }, { "name": "composer/class-map-generator", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "953cc4ea32e0c31f2185549c7d216d7921f03da9" + "reference": "8286a62d243312ed99b3eee20d5005c961adb311" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/953cc4ea32e0c31f2185549c7d216d7921f03da9", - "reference": "953cc4ea32e0c31f2185549c7d216d7921f03da9", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/8286a62d243312ed99b3eee20d5005c961adb311", + "reference": "8286a62d243312ed99b3eee20d5005c961adb311", "shasum": "" }, "require": { @@ -685,7 +685,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.1.0" + "source": "https://github.com/composer/class-map-generator/tree/1.1.1" }, "funding": [ { @@ -701,7 +701,7 @@ "type": "tidelift" } ], - "time": "2023-06-30T13:58:57+00:00" + "time": "2024-03-15T12:53:41+00:00" }, { "name": "composer/composer", @@ -1039,16 +1039,16 @@ }, { "name": "composer/pcre", - "version": "3.1.2", + "version": "3.1.3", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace" + "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/4775f35b2d70865807c89d32c8e7385b86eb0ace", - "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace", + "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", + "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", "shasum": "" }, "require": { @@ -1090,7 +1090,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.2" + "source": "https://github.com/composer/pcre/tree/3.1.3" }, "funding": [ { @@ -1106,7 +1106,7 @@ "type": "tidelift" } ], - "time": "2024-03-07T15:38:35+00:00" + "time": "2024-03-19T10:26:25+00:00" }, { "name": "composer/semver", @@ -3571,17 +3571,17 @@ }, { "name": "drupal/google_tag", - "version": "1.6.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/google_tag.git", - "reference": "8.x-1.6" + "reference": "8.x-1.7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/google_tag-8.x-1.6.zip", - "reference": "8.x-1.6", - "shasum": "d084315e54c2e561b8b64eef86081c2634d054cd" + "url": "https://ftp.drupal.org/files/projects/google_tag-8.x-1.7.zip", + "reference": "8.x-1.7", + "shasum": "e46c24b62c3c3c6b5d7232f3b679b46b1fe0c7a9" }, "require": { "drupal/core": "^8.8 || ^9 || ^10" @@ -3589,8 +3589,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.6", - "datestamp": "1671145853", + "version": "8.x-1.7", + "datestamp": "1710888941", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5552,16 +5552,16 @@ }, { "name": "instaclick/php-webdriver", - "version": "1.4.18", + "version": "1.4.19", "source": { "type": "git", "url": "https://github.com/instaclick/php-webdriver.git", - "reference": "a61a8459f86c79dd1f19934ea3929804f2e41f8c" + "reference": "3b2a2ddc4e0a690cc691d7e5952964cc4b9538b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/a61a8459f86c79dd1f19934ea3929804f2e41f8c", - "reference": "a61a8459f86c79dd1f19934ea3929804f2e41f8c", + "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/3b2a2ddc4e0a690cc691d7e5952964cc4b9538b1", + "reference": "3b2a2ddc4e0a690cc691d7e5952964cc4b9538b1", "shasum": "" }, "require": { @@ -5609,9 +5609,9 @@ ], "support": { "issues": "https://github.com/instaclick/php-webdriver/issues", - "source": "https://github.com/instaclick/php-webdriver/tree/1.4.18" + "source": "https://github.com/instaclick/php-webdriver/tree/1.4.19" }, - "time": "2023-12-08T07:11:19+00:00" + "time": "2024-03-19T01:58:53+00:00" }, { "name": "justinrainbow/json-schema", @@ -6473,21 +6473,21 @@ }, { "name": "nikic/php-parser", - "version": "v4.18.0", + "version": "v4.19.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b", + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.1" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", @@ -6523,9 +6523,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1" }, - "time": "2023-12-10T21:03:43+00:00" + "time": "2024-03-17T08:10:35+00:00" }, { "name": "open-telemetry/api", @@ -7152,12 +7152,12 @@ "source": { "type": "git", "url": "https://github.com/pear/pear-core-minimal.git", - "reference": "d457b5c93e5001fbf4b5726d21038266e029e3be" + "reference": "ce0adade8b97561656ace07cdaac4751c271ea8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/d457b5c93e5001fbf4b5726d21038266e029e3be", - "reference": "d457b5c93e5001fbf4b5726d21038266e029e3be", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/ce0adade8b97561656ace07cdaac4751c271ea8c", + "reference": "ce0adade8b97561656ace07cdaac4751c271ea8c", "shasum": "" }, "require": { @@ -7170,9 +7170,9 @@ }, "type": "library", "autoload": { - "psr-0": { - "": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "include-path": [ @@ -7193,7 +7193,7 @@ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR", "source": "https://github.com/pear/pear-core-minimal" }, - "time": "2024-03-09T19:38:40+00:00" + "time": "2024-03-16T18:41:45+00:00" }, { "name": "pear/pear_exception", @@ -7675,16 +7675,16 @@ }, { "name": "php-http/promise", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/php-http/promise.git", - "reference": "2916a606d3b390f4e9e8e2b8dd68581508be0f07" + "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/promise/zipball/2916a606d3b390f4e9e8e2b8dd68581508be0f07", - "reference": "2916a606d3b390f4e9e8e2b8dd68581508be0f07", + "url": "https://api.github.com/repos/php-http/promise/zipball/fc85b1fba37c169a69a07ef0d5a8075770cc1f83", + "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83", "shasum": "" }, "require": { @@ -7721,9 +7721,9 @@ ], "support": { "issues": "https://github.com/php-http/promise/issues", - "source": "https://github.com/php-http/promise/tree/1.3.0" + "source": "https://github.com/php-http/promise/tree/1.3.1" }, - "time": "2024-01-04T18:49:48+00:00" + "time": "2024-03-15T13:55:21+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -8264,16 +8264,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.62", + "version": "1.10.63", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9" + "reference": "ad12836d9ca227301f5fb9960979574ed8628339" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd5c8a1660ed3540b211407c77abf4af193a6af9", - "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ad12836d9ca227301f5fb9960979574ed8628339", + "reference": "ad12836d9ca227301f5fb9960979574ed8628339", "shasum": "" }, "require": { @@ -8322,7 +8322,7 @@ "type": "tidelift" } ], - "time": "2024-03-13T12:27:20+00:00" + "time": "2024-03-18T16:53:53+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -10258,16 +10258,16 @@ }, { "name": "sebastian/resource-operations", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e", + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e", "shasum": "" }, "require": { @@ -10279,7 +10279,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -10300,8 +10300,7 @@ "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4" }, "funding": [ { @@ -10309,8 +10308,7 @@ "type": "github" } ], - "abandoned": true, - "time": "2020-09-28T06:45:17+00:00" + "time": "2024-03-14T16:00:52+00:00" }, { "name": "sebastian/type", @@ -14714,10 +14712,6 @@ "GPL-2.0-or-later" ], "authors": [ - { - "name": "drupalspoons", - "homepage": "https://www.drupal.org/user/3647684" - }, { "name": "moshe weitzman", "homepage": "https://www.drupal.org/user/23" From 619509fcb4ce56b9a1de49ab004b5857264b7465 Mon Sep 17 00:00:00 2001 From: Peter Lieverdink Date: Mon, 25 Mar 2024 21:45:49 +0000 Subject: [PATCH 2/9] fix: Do not break security check builds on abandoned packages. They need to be addressed upstream. (#245) Refs: OPS-10213 --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index f9ab0d6..f309a98 100644 --- a/composer.json +++ b/composer.json @@ -89,6 +89,9 @@ "phpstan/extension-installer": true, "symfony/flex": true, "php-http/discovery": true + }, + "audit": { + "abandoned": "report" } }, "autoload": { From a12e3a579e5672f606d017591b44216de377f66e Mon Sep 17 00:00:00 2001 From: unocha-jenkins Date: Thu, 28 Mar 2024 06:37:09 +0000 Subject: [PATCH 3/9] chore: Update all outdated drupal/* packages. --- composer.lock | 117 ++++++++++++++++++++++++-------------------------- 1 file changed, 56 insertions(+), 61 deletions(-) diff --git a/composer.lock b/composer.lock index 9091441..2803dc0 100644 --- a/composer.lock +++ b/composer.lock @@ -118,16 +118,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.301.4", + "version": "3.301.9", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "1d04b11a621eaceb389d2cfbd82bcdc423903796" + "reference": "23eda9eeb6c44a3ed6a12951b61020dc6048f7f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1d04b11a621eaceb389d2cfbd82bcdc423903796", - "reference": "1d04b11a621eaceb389d2cfbd82bcdc423903796", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/23eda9eeb6c44a3ed6a12951b61020dc6048f7f5", + "reference": "23eda9eeb6c44a3ed6a12951b61020dc6048f7f5", "shasum": "" }, "require": { @@ -207,9 +207,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.301.4" + "source": "https://github.com/aws/aws-sdk-php/tree/3.301.9" }, - "time": "2024-03-20T18:16:55+00:00" + "time": "2024-03-27T18:26:04+00:00" }, { "name": "behat/mink", @@ -1271,16 +1271,16 @@ }, { "name": "composer/xdebug-handler", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "ced299686f41dce890debac69273b47ffe98a40c" + "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", - "reference": "ced299686f41dce890debac69273b47ffe98a40c", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/4f988f8fdf580d53bdb2d1278fe93d1ed5462255", + "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255", "shasum": "" }, "require": { @@ -1291,7 +1291,7 @@ "require-dev": { "phpstan/phpstan": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^6.0" + "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5" }, "type": "library", "autoload": { @@ -1315,9 +1315,9 @@ "performance" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.4" }, "funding": [ { @@ -1333,7 +1333,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T21:32:43+00:00" + "time": "2024-03-26T18:29:49+00:00" }, { "name": "consolidation/annotated-command", @@ -2762,20 +2762,20 @@ }, { "name": "drupal/config_split", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_split.git", - "reference": "2.0.0" + "reference": "2.0.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_split-2.0.0.zip", - "reference": "2.0.0", - "shasum": "be9fd0aba1206e0f19e8448f69d4210e53dae069" + "url": "https://ftp.drupal.org/files/projects/config_split-2.0.1.zip", + "reference": "2.0.1", + "shasum": "e033a277995753c564f3a4681b88cd112e19ba2a" }, "require": { - "drupal/core": "^8.8 || ^9 || ^10" + "drupal/core": "^8.8 || ^9 || ^10 || ^11" }, "conflict": { "drush/drush": "<10" @@ -2790,8 +2790,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0", - "datestamp": "1707999066", + "version": "2.0.1", + "datestamp": "1711022056", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6141,16 +6141,16 @@ }, { "name": "mglaman/phpstan-drupal", - "version": "1.2.7", + "version": "1.2.9", "source": { "type": "git", "url": "https://github.com/mglaman/phpstan-drupal.git", - "reference": "32f79fcf48c74532014248687ae3850581a22416" + "reference": "206285277fad650560cb26b43397b952228e3006" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/32f79fcf48c74532014248687ae3850581a22416", - "reference": "32f79fcf48c74532014248687ae3850581a22416", + "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/206285277fad650560cb26b43397b952228e3006", + "reference": "206285277fad650560cb26b43397b952228e3006", "shasum": "" }, "require": { @@ -6164,7 +6164,7 @@ "require-dev": { "behat/mink": "^1.8", "composer/installers": "^1.9", - "drupal/core-recommended": "^9.0", + "drupal/core-recommended": "^10", "drush/drush": "^10.0 || ^11 || ^12", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-strict-rules": "^1.0", @@ -6225,7 +6225,7 @@ "description": "Drupal extension and rules for PHPStan", "support": { "issues": "https://github.com/mglaman/phpstan-drupal/issues", - "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.7" + "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.9" }, "funding": [ { @@ -6241,7 +6241,7 @@ "type": "tidelift" } ], - "time": "2024-02-14T04:38:08+00:00" + "time": "2024-03-22T18:50:10+00:00" }, { "name": "micheh/phpcs-gitlab", @@ -8217,16 +8217,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.26.0", + "version": "1.27.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "231e3186624c03d7e7c890ec662b81e6b0405227" + "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227", - "reference": "231e3186624c03d7e7c890ec662b81e6b0405227", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/86e4d5a4b036f8f0be1464522f4c6b584c452757", + "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757", "shasum": "" }, "require": { @@ -8258,22 +8258,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.27.0" }, - "time": "2024-02-23T16:05:55+00:00" + "time": "2024-03-21T13:14:53+00:00" }, { "name": "phpstan/phpstan", - "version": "1.10.63", + "version": "1.10.65", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "ad12836d9ca227301f5fb9960979574ed8628339" + "reference": "3c657d057a0b7ecae19cb12db446bbc99d8839c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ad12836d9ca227301f5fb9960979574ed8628339", - "reference": "ad12836d9ca227301f5fb9960979574ed8628339", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3c657d057a0b7ecae19cb12db446bbc99d8839c6", + "reference": "3c657d057a0b7ecae19cb12db446bbc99d8839c6", "shasum": "" }, "require": { @@ -8322,7 +8322,7 @@ "type": "tidelift" } ], - "time": "2024-03-18T16:53:53+00:00" + "time": "2024-03-23T10:30:26+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -8745,16 +8745,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.17", + "version": "9.6.18", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd" + "reference": "32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1a156980d78a6666721b7e8e8502fe210b587fcd", - "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04", + "reference": "32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04", "shasum": "" }, "require": { @@ -8828,7 +8828,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.17" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.18" }, "funding": [ { @@ -8844,7 +8844,7 @@ "type": "tidelift" } ], - "time": "2024-02-23T13:14:51+00:00" + "time": "2024-03-21T12:07:32+00:00" }, { "name": "psr/cache", @@ -14664,29 +14664,29 @@ }, { "name": "drupal/devel", - "version": "5.1.2", + "version": "5.2.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/devel.git", - "reference": "5.1.2" + "reference": "5.2.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/devel-5.1.2.zip", - "reference": "5.1.2", - "shasum": "9b35e38bf2043bf87f88585b3d9100f38da8f07f" + "url": "https://ftp.drupal.org/files/projects/devel-5.2.0.zip", + "reference": "5.2.0", + "shasum": "9b7baa45a3caea3908643ef22882205ec2ed0da1" }, "require": { "doctrine/common": "^2.7 || ^3.4", - "drupal/core": "^9 || ^10", - "php": ">=7.4", + "drupal/core": ">=10.0 <12.0.0-stable", + "php": ">=8.1", "symfony/var-dumper": "^4 || ^5 || ^6" }, "conflict": { "kint-php/kint": "<3" }, "require-dev": { - "drush/drush": "^11" + "drush/drush": "^12.5.1" }, "suggest": { "kint-php/kint": "Kint provides an informative display of arrays/objects. Useful for debugging and developing." @@ -14694,17 +14694,12 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "5.1.2", - "datestamp": "1686161028", + "version": "5.2.0", + "datestamp": "1711280160", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" } - }, - "drush": { - "services": { - "drush.services.yml": "^9 || ^10 || ^11" - } } }, "notification-url": "https://packages.drupal.org/8/downloads", From 9e88c29e6455a989847e18049e24e2a16275e869 Mon Sep 17 00:00:00 2001 From: Andy Footner Date: Thu, 28 Mar 2024 12:17:59 -0300 Subject: [PATCH 4/9] chore: use action package configuration for updates Refs: OPS-10151 --- .github/workflows/composer-update.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/composer-update.yml b/.github/workflows/composer-update.yml index 72d815a..762fd81 100644 --- a/.github/workflows/composer-update.yml +++ b/.github/workflows/composer-update.yml @@ -15,7 +15,6 @@ jobs: with: github_access_token: ${{ secrets.PAT }} patch_branch: 'develop' - patch_packages: 'drupal/*' patch_maintainers: ${{ secrets.DRUPAL_MAINTAINERS }} slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }} slack_channel_name: ${{ secrets.SLACK_CHANNEL }} From aea5f84e9cd4f92dfc6b6eacd780935abf2499f8 Mon Sep 17 00:00:00 2001 From: unocha-jenkins Date: Thu, 4 Apr 2024 06:37:23 +0000 Subject: [PATCH 5/9] chore: Update all outdated drupal/* unocha/* drush/* packages. --- .gitattributes | 3 + composer.lock | 494 +++++++++++++++++++++++++------------------------ 2 files changed, 253 insertions(+), 244 deletions(-) diff --git a/.gitattributes b/.gitattributes index 76ea8fe..e7b792f 100644 --- a/.gitattributes +++ b/.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." diff --git a/composer.lock b/composer.lock index 2803dc0..7711023 100644 --- a/composer.lock +++ b/composer.lock @@ -118,16 +118,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.301.9", + "version": "3.303.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "23eda9eeb6c44a3ed6a12951b61020dc6048f7f5" + "reference": "c087819351de027791d830ffc7f45195488ae988" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/23eda9eeb6c44a3ed6a12951b61020dc6048f7f5", - "reference": "23eda9eeb6c44a3ed6a12951b61020dc6048f7f5", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c087819351de027791d830ffc7f45195488ae988", + "reference": "c087819351de027791d830ffc7f45195488ae988", "shasum": "" }, "require": { @@ -207,9 +207,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.301.9" + "source": "https://github.com/aws/aws-sdk-php/tree/3.303.2" }, - "time": "2024-03-27T18:26:04+00:00" + "time": "2024-04-03T18:08:21+00:00" }, { "name": "behat/mink", @@ -417,16 +417,16 @@ }, { "name": "chi-teck/drupal-code-generator", - "version": "3.3.0", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/Chi-teck/drupal-code-generator.git", - "reference": "56da9209b24a5a5b5d27bec9e523f02bdd101770" + "reference": "b8136b945dc3446894e6cd2b2f055e147140faed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/56da9209b24a5a5b5d27bec9e523f02bdd101770", - "reference": "56da9209b24a5a5b5d27bec9e523f02bdd101770", + "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/b8136b945dc3446894e6cd2b2f055e147140faed", + "reference": "b8136b945dc3446894e6cd2b2f055e147140faed", "shasum": "" }, "require": { @@ -444,16 +444,16 @@ "squizlabs/php_codesniffer": "<3.6" }, "require-dev": { - "chi-teck/drupal-coder-extension": "^2.0.0-alpha4", - "drupal/coder": "8.3.22", - "drupal/core": "10.1.x-dev", + "chi-teck/drupal-coder-extension": "^2.0.0-beta2", + "drupal/coder": "8.3.23", + "drupal/core": "10.3.x-dev", "ext-simplexml": "*", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.5", - "squizlabs/php_codesniffer": "^3.7", - "symfony/var-dumper": "^6.3", + "phpspec/prophecy-phpunit": "^2.2", + "phpunit/phpunit": "^9.6", + "squizlabs/php_codesniffer": "^3.9", + "symfony/var-dumper": "^6.4", "symfony/yaml": "^6.3", - "vimeo/psalm": "^5.14.0" + "vimeo/psalm": "^5.22.2" }, "bin": [ "bin/dcg" @@ -471,9 +471,9 @@ "description": "Drupal code generator", "support": { "issues": "https://github.com/Chi-teck/drupal-code-generator/issues", - "source": "https://github.com/Chi-teck/drupal-code-generator/tree/3.3.0" + "source": "https://github.com/Chi-teck/drupal-code-generator/tree/3.4.0" }, - "time": "2023-10-21T12:57:05+00:00" + "time": "2024-03-10T13:35:00+00:00" }, { "name": "colinodell/psr-testlogger", @@ -1337,16 +1337,16 @@ }, { "name": "consolidation/annotated-command", - "version": "4.9.1", + "version": "4.9.2", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "e01152f698eff4cb5df3ebfe5e097ef335dbd3c9" + "reference": "b5255dcbee1de95036185062a103dabc622224de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/e01152f698eff4cb5df3ebfe5e097ef335dbd3c9", - "reference": "e01152f698eff4cb5df3ebfe5e097ef335dbd3c9", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/b5255dcbee1de95036185062a103dabc622224de", + "reference": "b5255dcbee1de95036185062a103dabc622224de", "shasum": "" }, "require": { @@ -1387,9 +1387,9 @@ "description": "Initialize Symfony Console commands from annotated command class methods.", "support": { "issues": "https://github.com/consolidation/annotated-command/issues", - "source": "https://github.com/consolidation/annotated-command/tree/4.9.1" + "source": "https://github.com/consolidation/annotated-command/tree/4.9.2" }, - "time": "2023-05-20T04:19:01+00:00" + "time": "2023-12-26T14:30:50+00:00" }, { "name": "consolidation/config", @@ -1555,30 +1555,30 @@ }, { "name": "consolidation/output-formatters", - "version": "4.3.2", + "version": "4.5.0", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "06711568b4cd169700ff7e8075db0a9a341ceb58" + "reference": "7a611b01eb48eb19cd54672339fc08c0985bf540" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/06711568b4cd169700ff7e8075db0a9a341ceb58", - "reference": "06711568b4cd169700ff7e8075db0a9a341ceb58", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/7a611b01eb48eb19cd54672339fc08c0985bf540", + "reference": "7a611b01eb48eb19cd54672339fc08c0985bf540", "shasum": "" }, "require": { "dflydev/dot-access-data": "^1.1.0 || ^2 || ^3", "php": ">=7.1.3", - "symfony/console": "^4 || ^5 || ^6", - "symfony/finder": "^4 || ^5 || ^6" + "symfony/console": "^4 || ^5 || ^6 || ^7", + "symfony/finder": "^4 || ^5 || ^6 || ^7" }, "require-dev": { "php-coveralls/php-coveralls": "^2.4.2", "phpunit/phpunit": "^7 || ^8 || ^9", "squizlabs/php_codesniffer": "^3", - "symfony/var-dumper": "^4 || ^5 || ^6", - "symfony/yaml": "^4 || ^5 || ^6", + "symfony/var-dumper": "^4 || ^5 || ^6 || ^7", + "symfony/yaml": "^4 || ^5 || ^6 || ^7", "yoast/phpunit-polyfills": "^1" }, "suggest": { @@ -1603,9 +1603,9 @@ "description": "Format text by applying transformations provided by plug-in formatters.", "support": { "issues": "https://github.com/consolidation/output-formatters/issues", - "source": "https://github.com/consolidation/output-formatters/tree/4.3.2" + "source": "https://github.com/consolidation/output-formatters/tree/4.5.0" }, - "time": "2023-07-06T04:45:41+00:00" + "time": "2024-04-02T15:18:52+00:00" }, { "name": "consolidation/robo", @@ -1796,16 +1796,16 @@ }, { "name": "consolidation/site-process", - "version": "5.2.0", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/consolidation/site-process.git", - "reference": "6c44638d7af8a8b4abe12c3180701243f480539d" + "reference": "5e8eff50fd0015e7ca0b6ce4082cacef012f2f77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/site-process/zipball/6c44638d7af8a8b4abe12c3180701243f480539d", - "reference": "6c44638d7af8a8b4abe12c3180701243f480539d", + "url": "https://api.github.com/repos/consolidation/site-process/zipball/5e8eff50fd0015e7ca0b6ce4082cacef012f2f77", + "reference": "5e8eff50fd0015e7ca0b6ce4082cacef012f2f77", "shasum": "" }, "require": { @@ -1847,9 +1847,9 @@ "description": "A thin wrapper around the Symfony Process Component that allows applications to use the Site Alias library to specify the target for a remote call.", "support": { "issues": "https://github.com/consolidation/site-process/issues", - "source": "https://github.com/consolidation/site-process/tree/5.2.0" + "source": "https://github.com/consolidation/site-process/tree/5.3.0" }, - "time": "2022-12-06T17:57:16+00:00" + "time": "2024-04-01T12:42:12+00:00" }, { "name": "cweagans/composer-patches", @@ -2840,16 +2840,16 @@ }, { "name": "drupal/core", - "version": "10.2.4", + "version": "10.2.5", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "d1c5b44adfc79bda03252471491b0fba89d87eff" + "reference": "dddd242b74f40df892a7f16a48245c3b76d9b003" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/d1c5b44adfc79bda03252471491b0fba89d87eff", - "reference": "d1c5b44adfc79bda03252471491b0fba89d87eff", + "url": "https://api.github.com/repos/drupal/core/zipball/dddd242b74f40df892a7f16a48245c3b76d9b003", + "reference": "dddd242b74f40df892a7f16a48245c3b76d9b003", "shasum": "" }, "require": { @@ -2997,13 +2997,13 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.2.4" + "source": "https://github.com/drupal/core/tree/10.2.5" }, - "time": "2024-03-06T08:23:56+00:00" + "time": "2024-04-03T07:19:20+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.2.4", + "version": "10.2.5", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -3047,13 +3047,13 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.2.4" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.2.5" }, "time": "2024-01-26T14:59:30+00:00" }, { "name": "drupal/core-dev", - "version": "10.2.4", + "version": "10.2.5", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", @@ -3103,22 +3103,22 @@ ], "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.", "support": { - "source": "https://github.com/drupal/core-dev/tree/10.2.4" + "source": "https://github.com/drupal/core-dev/tree/10.2.5" }, "time": "2024-02-14T18:07:20+00:00" }, { "name": "drupal/core-recommended", - "version": "10.2.4", + "version": "10.2.5", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "550c4cb19afda15ef892d88469ab93dc38bf0b46" + "reference": "bd7fe9e734a82762814d9c31255cd362d9c044f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/550c4cb19afda15ef892d88469ab93dc38bf0b46", - "reference": "550c4cb19afda15ef892d88469ab93dc38bf0b46", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/bd7fe9e734a82762814d9c31255cd362d9c044f1", + "reference": "bd7fe9e734a82762814d9c31255cd362d9c044f1", "shasum": "" }, "require": { @@ -3127,7 +3127,7 @@ "doctrine/annotations": "~1.14.3", "doctrine/deprecations": "~1.1.2", "doctrine/lexer": "~2.1.0", - "drupal/core": "10.2.4", + "drupal/core": "10.2.5", "egulias/email-validator": "~4.0.2", "guzzlehttp/guzzle": "~7.8.1", "guzzlehttp/promises": "~2.0.2", @@ -3188,9 +3188,9 @@ ], "description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.", "support": { - "source": "https://github.com/drupal/core-recommended/tree/10.2.4" + "source": "https://github.com/drupal/core-recommended/tree/10.2.5" }, - "time": "2024-03-06T08:23:56+00:00" + "time": "2024-04-03T07:19:20+00:00" }, { "name": "drupal/csp", @@ -4803,23 +4803,23 @@ }, { "name": "drush/drush", - "version": "12.4.3", + "version": "12.5.1", "source": { "type": "git", "url": "https://github.com/drush-ops/drush.git", - "reference": "8245acede57ecc62a90aa0f19ff3b29e5f11f971" + "reference": "71fcea30a22e7336e17be18bb5945400b2c63fad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drush-ops/drush/zipball/8245acede57ecc62a90aa0f19ff3b29e5f11f971", - "reference": "8245acede57ecc62a90aa0f19ff3b29e5f11f971", + "url": "https://api.github.com/repos/drush-ops/drush/zipball/71fcea30a22e7336e17be18bb5945400b2c63fad", + "reference": "71fcea30a22e7336e17be18bb5945400b2c63fad", "shasum": "" }, "require": { "chi-teck/drupal-code-generator": "^3.0", "composer-runtime-api": "^2.2", "composer/semver": "^1.4 || ^3", - "consolidation/annotated-command": "^4.9.1", + "consolidation/annotated-command": "^4.9.2", "consolidation/config": "^2.1.2", "consolidation/filter-via-dot-access-data": "^2.0.2", "consolidation/output-formatters": "^4.3.2", @@ -4935,7 +4935,7 @@ "issues": "https://github.com/drush-ops/drush/issues", "security": "https://github.com/drush-ops/drush/security/advisories", "slack": "https://drupal.slack.com/messages/C62H9CWQM", - "source": "https://github.com/drush-ops/drush/tree/12.4.3" + "source": "https://github.com/drush-ops/drush/tree/12.5.1" }, "funding": [ { @@ -4943,7 +4943,7 @@ "type": "github" } ], - "time": "2023-11-16T22:57:24+00:00" + "time": "2024-03-20T15:03:27+00:00" }, { "name": "egulias/email-validator", @@ -5685,16 +5685,16 @@ }, { "name": "league/container", - "version": "4.2.0", + "version": "4.2.2", "source": { "type": "git", "url": "https://github.com/thephpleague/container.git", - "reference": "375d13cb828649599ef5d48a339c4af7a26cd0ab" + "reference": "ff346319ca1ff0e78277dc2311a42107cc1aab88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/container/zipball/375d13cb828649599ef5d48a339c4af7a26cd0ab", - "reference": "375d13cb828649599ef5d48a339c4af7a26cd0ab", + "url": "https://api.github.com/repos/thephpleague/container/zipball/ff346319ca1ff0e78277dc2311a42107cc1aab88", + "reference": "ff346319ca1ff0e78277dc2311a42107cc1aab88", "shasum": "" }, "require": { @@ -5755,7 +5755,7 @@ ], "support": { "issues": "https://github.com/thephpleague/container/issues", - "source": "https://github.com/thephpleague/container/tree/4.2.0" + "source": "https://github.com/thephpleague/container/tree/4.2.2" }, "funding": [ { @@ -5763,7 +5763,7 @@ "type": "github" } ], - "time": "2021-11-16T10:29:06+00:00" + "time": "2024-03-13T13:12:53+00:00" }, { "name": "league/oauth2-client", @@ -6141,16 +6141,16 @@ }, { "name": "mglaman/phpstan-drupal", - "version": "1.2.9", + "version": "1.2.10", "source": { "type": "git", "url": "https://github.com/mglaman/phpstan-drupal.git", - "reference": "206285277fad650560cb26b43397b952228e3006" + "reference": "cdafb3285beeb5fadf25a43e18fee6f80bb14575" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/206285277fad650560cb26b43397b952228e3006", - "reference": "206285277fad650560cb26b43397b952228e3006", + "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/cdafb3285beeb5fadf25a43e18fee6f80bb14575", + "reference": "cdafb3285beeb5fadf25a43e18fee6f80bb14575", "shasum": "" }, "require": { @@ -6225,7 +6225,7 @@ "description": "Drupal extension and rules for PHPStan", "support": { "issues": "https://github.com/mglaman/phpstan-drupal/issues", - "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.9" + "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.10" }, "funding": [ { @@ -6241,7 +6241,7 @@ "type": "tidelift" } ], - "time": "2024-03-22T18:50:10+00:00" + "time": "2024-04-02T17:27:29+00:00" }, { "name": "micheh/phpcs-gitlab", @@ -6473,25 +6473,27 @@ }, { "name": "nikic/php-parser", - "version": "v4.19.1", + "version": "v5.0.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b" + "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b", - "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13", + "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13", "shasum": "" }, "require": { + "ext-ctype": "*", + "ext-json": "*", "ext-tokenizer": "*", - "php": ">=7.1" + "php": ">=7.4" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/php-parse" @@ -6499,7 +6501,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.9-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -6523,9 +6525,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2" }, - "time": "2024-03-17T08:10:35+00:00" + "time": "2024-03-05T20:51:40+00:00" }, { "name": "open-telemetry/api", @@ -7478,16 +7480,16 @@ }, { "name": "php-http/discovery", - "version": "1.19.2", + "version": "1.19.4", "source": { "type": "git", "url": "https://github.com/php-http/discovery.git", - "reference": "61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb" + "reference": "0700efda8d7526335132360167315fdab3aeb599" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb", - "reference": "61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb", + "url": "https://api.github.com/repos/php-http/discovery/zipball/0700efda8d7526335132360167315fdab3aeb599", + "reference": "0700efda8d7526335132360167315fdab3aeb599", "shasum": "" }, "require": { @@ -7511,7 +7513,8 @@ "php-http/httplug": "^1.0 || ^2.0", "php-http/message-factory": "^1.0", "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3", - "symfony/phpunit-bridge": "^6.2" + "sebastian/comparator": "^3.0.5 || ^4.0.8", + "symfony/phpunit-bridge": "^6.4.4 || ^7.0.1" }, "type": "composer-plugin", "extra": { @@ -7550,9 +7553,9 @@ ], "support": { "issues": "https://github.com/php-http/discovery/issues", - "source": "https://github.com/php-http/discovery/tree/1.19.2" + "source": "https://github.com/php-http/discovery/tree/1.19.4" }, - "time": "2023-11-30T16:49:05+00:00" + "time": "2024-03-29T13:00:05+00:00" }, { "name": "php-http/guzzle7-adapter", @@ -8217,16 +8220,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.27.0", + "version": "1.28.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757" + "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/86e4d5a4b036f8f0be1464522f4c6b584c452757", - "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", + "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", "shasum": "" }, "require": { @@ -8258,22 +8261,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.27.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0" }, - "time": "2024-03-21T13:14:53+00:00" + "time": "2024-04-03T18:51:33+00:00" }, { "name": "phpstan/phpstan", - "version": "1.10.65", + "version": "1.10.66", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "3c657d057a0b7ecae19cb12db446bbc99d8839c6" + "reference": "94779c987e4ebd620025d9e5fdd23323903950bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3c657d057a0b7ecae19cb12db446bbc99d8839c6", - "reference": "3c657d057a0b7ecae19cb12db446bbc99d8839c6", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/94779c987e4ebd620025d9e5fdd23323903950bd", + "reference": "94779c987e4ebd620025d9e5fdd23323903950bd", "shasum": "" }, "require": { @@ -8322,7 +8325,7 @@ "type": "tidelift" } ], - "time": "2024-03-23T10:30:26+00:00" + "time": "2024-03-28T16:17:31+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -9261,25 +9264,25 @@ }, { "name": "psy/psysh", - "version": "v0.11.22", + "version": "v0.12.3", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b" + "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b", - "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73", + "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73", "shasum": "" }, "require": { "ext-json": "*", "ext-tokenizer": "*", - "nikic/php-parser": "^4.0 || ^3.1", - "php": "^8.0 || ^7.0.8", - "symfony/console": "^6.0 || ^5.0 || ^4.0 || ^3.4", - "symfony/var-dumper": "^6.0 || ^5.0 || ^4.0 || ^3.4" + "nikic/php-parser": "^5.0 || ^4.0", + "php": "^8.0 || ^7.4", + "symfony/console": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4", + "symfony/var-dumper": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4" }, "conflict": { "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4" @@ -9290,8 +9293,7 @@ "suggest": { "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", "ext-pdo-sqlite": "The doc command requires SQLite to work.", - "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.", - "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history." + "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well." }, "bin": [ "bin/psysh" @@ -9299,7 +9301,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-0.11": "0.11.x-dev" + "dev-main": "0.12.x-dev" }, "bamarni-bin": { "bin-links": false, @@ -9335,9 +9337,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.22" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.3" }, - "time": "2023-10-14T21:56:36+00:00" + "time": "2024-04-02T15:57:53+00:00" }, { "name": "ralouphie/getallheaders", @@ -10717,16 +10719,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.9.0", + "version": "3.9.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" + "reference": "267a4405fff1d9c847134db3a3c92f1ab7f77909" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", - "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/267a4405fff1d9c847134db3a3c92f1ab7f77909", + "reference": "267a4405fff1d9c847134db3a3c92f1ab7f77909", "shasum": "" }, "require": { @@ -10793,7 +10795,7 @@ "type": "open_collective" } ], - "time": "2024-02-16T15:06:51+00:00" + "time": "2024-03-31T21:03:09+00:00" }, { "name": "symfony/browser-kit", @@ -10865,16 +10867,16 @@ }, { "name": "symfony/console", - "version": "v6.4.4", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0d9e4eb5ad413075624378f474c4167ea202de78" + "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78", - "reference": "0d9e4eb5ad413075624378f474c4167ea202de78", + "url": "https://api.github.com/repos/symfony/console/zipball/a2708a5da5c87d1d0d52937bdeac625df659e11f", + "reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f", "shasum": "" }, "require": { @@ -10939,7 +10941,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.4" + "source": "https://github.com/symfony/console/tree/v6.4.6" }, "funding": [ { @@ -10955,7 +10957,7 @@ "type": "tidelift" } ], - "time": "2024-02-22T20:27:10+00:00" + "time": "2024-03-29T19:07:53+00:00" }, { "name": "symfony/css-selector", @@ -11024,16 +11026,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v6.4.4", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "6236e5e843cb763e9d0f74245678b994afea5363" + "reference": "31417777509923b22de5c6fb6b3ffcdebde37cb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6236e5e843cb763e9d0f74245678b994afea5363", - "reference": "6236e5e843cb763e9d0f74245678b994afea5363", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/31417777509923b22de5c6fb6b3ffcdebde37cb5", + "reference": "31417777509923b22de5c6fb6b3ffcdebde37cb5", "shasum": "" }, "require": { @@ -11085,7 +11087,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.4" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.6" }, "funding": [ { @@ -11101,7 +11103,7 @@ "type": "tidelift" } ], - "time": "2024-02-22T20:27:10+00:00" + "time": "2024-03-27T22:00:14+00:00" }, { "name": "symfony/deprecation-contracts", @@ -11239,16 +11241,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.4.4", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "c725219bdf2afc59423c32793d5019d2a904e13a" + "reference": "64db1c1802e3a4557e37ba33031ac39f452ac5d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/c725219bdf2afc59423c32793d5019d2a904e13a", - "reference": "c725219bdf2afc59423c32793d5019d2a904e13a", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/64db1c1802e3a4557e37ba33031ac39f452ac5d4", + "reference": "64db1c1802e3a4557e37ba33031ac39f452ac5d4", "shasum": "" }, "require": { @@ -11294,7 +11296,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.4.4" + "source": "https://github.com/symfony/error-handler/tree/v6.4.6" }, "funding": [ { @@ -11310,7 +11312,7 @@ "type": "tidelift" } ], - "time": "2024-02-22T20:27:10+00:00" + "time": "2024-03-19T11:56:30+00:00" }, { "name": "symfony/event-dispatcher", @@ -11394,16 +11396,16 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.4.0", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "a76aed96a42d2b521153fb382d418e30d18b59df" + "reference": "4e64b49bf370ade88e567de29465762e316e4224" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df", - "reference": "a76aed96a42d2b521153fb382d418e30d18b59df", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/4e64b49bf370ade88e567de29465762e316e4224", + "reference": "4e64b49bf370ade88e567de29465762e316e4224", "shasum": "" }, "require": { @@ -11450,7 +11452,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.2" }, "funding": [ { @@ -11466,20 +11468,20 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/filesystem", - "version": "v6.4.3", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb" + "reference": "9919b5509ada52cc7f66f9a35c86a4a29955c9d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", - "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/9919b5509ada52cc7f66f9a35c86a4a29955c9d3", + "reference": "9919b5509ada52cc7f66f9a35c86a4a29955c9d3", "shasum": "" }, "require": { @@ -11513,7 +11515,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.3" + "source": "https://github.com/symfony/filesystem/tree/v6.4.6" }, "funding": [ { @@ -11529,7 +11531,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-03-21T19:36:20+00:00" }, { "name": "symfony/finder", @@ -11674,16 +11676,16 @@ }, { "name": "symfony/http-kernel", - "version": "v6.4.5", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "f6947cb939d8efee137797382cb4db1af653ef75" + "reference": "060038863743fd0cd982be06acecccf246d35653" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f6947cb939d8efee137797382cb4db1af653ef75", - "reference": "f6947cb939d8efee137797382cb4db1af653ef75", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/060038863743fd0cd982be06acecccf246d35653", + "reference": "060038863743fd0cd982be06acecccf246d35653", "shasum": "" }, "require": { @@ -11767,7 +11769,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.5" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.6" }, "funding": [ { @@ -11783,20 +11785,20 @@ "type": "tidelift" } ], - "time": "2024-03-04T21:00:47+00:00" + "time": "2024-04-03T06:09:15+00:00" }, { "name": "symfony/lock", - "version": "v6.4.3", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", - "reference": "1cabf3cc775b1aa6008ebd471fa773444af4e956" + "reference": "53f0dbf55871774bf42773ed478b7106486b8b98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/lock/zipball/1cabf3cc775b1aa6008ebd471fa773444af4e956", - "reference": "1cabf3cc775b1aa6008ebd471fa773444af4e956", + "url": "https://api.github.com/repos/symfony/lock/zipball/53f0dbf55871774bf42773ed478b7106486b8b98", + "reference": "53f0dbf55871774bf42773ed478b7106486b8b98", "shasum": "" }, "require": { @@ -11846,7 +11848,7 @@ "semaphore" ], "support": { - "source": "https://github.com/symfony/lock/tree/v6.4.3" + "source": "https://github.com/symfony/lock/tree/v6.4.6" }, "funding": [ { @@ -11862,20 +11864,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-03-19T09:23:21+00:00" }, { "name": "symfony/mailer", - "version": "v6.4.4", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "791c5d31a8204cf3db0c66faab70282307f4376b" + "reference": "677f34a6f4b4559e08acf73ae0aec460479e5859" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/791c5d31a8204cf3db0c66faab70282307f4376b", - "reference": "791c5d31a8204cf3db0c66faab70282307f4376b", + "url": "https://api.github.com/repos/symfony/mailer/zipball/677f34a6f4b4559e08acf73ae0aec460479e5859", + "reference": "677f34a6f4b4559e08acf73ae0aec460479e5859", "shasum": "" }, "require": { @@ -11926,7 +11928,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v6.4.4" + "source": "https://github.com/symfony/mailer/tree/v6.4.6" }, "funding": [ { @@ -11942,20 +11944,20 @@ "type": "tidelift" } ], - "time": "2024-02-03T21:33:47+00:00" + "time": "2024-03-27T21:14:17+00:00" }, { "name": "symfony/mime", - "version": "v6.4.3", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "5017e0a9398c77090b7694be46f20eb796262a34" + "reference": "14762b86918823cb42e3558cdcca62e58b5227fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/5017e0a9398c77090b7694be46f20eb796262a34", - "reference": "5017e0a9398c77090b7694be46f20eb796262a34", + "url": "https://api.github.com/repos/symfony/mime/zipball/14762b86918823cb42e3558cdcca62e58b5227fe", + "reference": "14762b86918823cb42e3558cdcca62e58b5227fe", "shasum": "" }, "require": { @@ -11976,6 +11978,7 @@ "league/html-to-markdown": "^5.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.4|^7.0", "symfony/property-access": "^5.4|^6.0|^7.0", "symfony/property-info": "^5.4|^6.0|^7.0", "symfony/serializer": "^6.3.2|^7.0" @@ -12010,7 +12013,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.4.3" + "source": "https://github.com/symfony/mime/tree/v6.4.6" }, "funding": [ { @@ -12026,20 +12029,20 @@ "type": "tidelift" } ], - "time": "2024-01-30T08:32:12+00:00" + "time": "2024-03-21T19:36:20+00:00" }, { "name": "symfony/phpunit-bridge", - "version": "v6.4.4", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "16ed5bdfd18e14fc7de347c8688e8ac479284222" + "reference": "3065d1c5b4cd0a46b11845b705d21ee692e52cd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/16ed5bdfd18e14fc7de347c8688e8ac479284222", - "reference": "16ed5bdfd18e14fc7de347c8688e8ac479284222", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/3065d1c5b4cd0a46b11845b705d21ee692e52cd6", + "reference": "3065d1c5b4cd0a46b11845b705d21ee692e52cd6", "shasum": "" }, "require": { @@ -12091,7 +12094,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v6.4.4" + "source": "https://github.com/symfony/phpunit-bridge/tree/v6.4.6" }, "funding": [ { @@ -12107,7 +12110,7 @@ "type": "tidelift" } ], - "time": "2024-02-08T14:08:19+00:00" + "time": "2024-03-19T11:56:30+00:00" }, { "name": "symfony/polyfill-ctype", @@ -13133,16 +13136,16 @@ }, { "name": "symfony/psr-http-message-bridge", - "version": "v6.4.3", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/psr-http-message-bridge.git", - "reference": "49cfb0223ec64379f7154214dcc1f7c46f3c7a47" + "reference": "98059dd19bae6579a294e0fe5b3dfdbeb409845a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/49cfb0223ec64379f7154214dcc1f7c46f3c7a47", - "reference": "49cfb0223ec64379f7154214dcc1f7c46f3c7a47", + "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/98059dd19bae6579a294e0fe5b3dfdbeb409845a", + "reference": "98059dd19bae6579a294e0fe5b3dfdbeb409845a", "shasum": "" }, "require": { @@ -13196,7 +13199,7 @@ "psr-7" ], "support": { - "source": "https://github.com/symfony/psr-http-message-bridge/tree/v6.4.3" + "source": "https://github.com/symfony/psr-http-message-bridge/tree/v6.4.6" }, "funding": [ { @@ -13212,20 +13215,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-03-27T22:00:14+00:00" }, { "name": "symfony/routing", - "version": "v6.4.5", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4" + "reference": "f2591fd1f8c6e3734656b5d6b3829e8bf81f507c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/7fe30068e207d9c31c0138501ab40358eb2d49a4", - "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4", + "url": "https://api.github.com/repos/symfony/routing/zipball/f2591fd1f8c6e3734656b5d6b3829e8bf81f507c", + "reference": "f2591fd1f8c6e3734656b5d6b3829e8bf81f507c", "shasum": "" }, "require": { @@ -13279,7 +13282,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.4.5" + "source": "https://github.com/symfony/routing/tree/v6.4.6" }, "funding": [ { @@ -13295,20 +13298,20 @@ "type": "tidelift" } ], - "time": "2024-02-27T12:33:30+00:00" + "time": "2024-03-28T13:28:49+00:00" }, { "name": "symfony/serializer", - "version": "v6.4.4", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "88da7f8fe03c5f4c2a69da907f1de03fab2e6872" + "reference": "3697adf91f83516c86b4912c08c28084711ed560" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/88da7f8fe03c5f4c2a69da907f1de03fab2e6872", - "reference": "88da7f8fe03c5f4c2a69da907f1de03fab2e6872", + "url": "https://api.github.com/repos/symfony/serializer/zipball/3697adf91f83516c86b4912c08c28084711ed560", + "reference": "3697adf91f83516c86b4912c08c28084711ed560", "shasum": "" }, "require": { @@ -13377,7 +13380,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v6.4.4" + "source": "https://github.com/symfony/serializer/tree/v6.4.6" }, "funding": [ { @@ -13393,20 +13396,20 @@ "type": "tidelift" } ], - "time": "2024-02-22T20:27:10+00:00" + "time": "2024-03-27T22:00:14+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" + "reference": "11bbf19a0fb7b36345861e85c5768844c552906e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", - "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/11bbf19a0fb7b36345861e85c5768844c552906e", + "reference": "11bbf19a0fb7b36345861e85c5768844c552906e", "shasum": "" }, "require": { @@ -13459,7 +13462,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.2" }, "funding": [ { @@ -13475,7 +13478,7 @@ "type": "tidelift" } ], - "time": "2023-12-26T14:02:43+00:00" + "time": "2023-12-19T21:51:00+00:00" }, { "name": "symfony/string", @@ -13565,16 +13568,16 @@ }, { "name": "symfony/translation-contracts", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "06450585bf65e978026bda220cdebca3f867fde7" + "reference": "43810bdb2ddb5400e5c5e778e27b210a0ca83b6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/06450585bf65e978026bda220cdebca3f867fde7", - "reference": "06450585bf65e978026bda220cdebca3f867fde7", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/43810bdb2ddb5400e5c5e778e27b210a0ca83b6b", + "reference": "43810bdb2ddb5400e5c5e778e27b210a0ca83b6b", "shasum": "" }, "require": { @@ -13623,7 +13626,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.4.1" + "source": "https://github.com/symfony/translation-contracts/tree/v3.4.2" }, "funding": [ { @@ -13639,20 +13642,20 @@ "type": "tidelift" } ], - "time": "2023-12-26T14:02:43+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/validator", - "version": "v6.4.4", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "1cf92edc9a94d16275efef949fa6748d11cc8f47" + "reference": "ca1d78e8677e966e307a63799677b64b194d735d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/1cf92edc9a94d16275efef949fa6748d11cc8f47", - "reference": "1cf92edc9a94d16275efef949fa6748d11cc8f47", + "url": "https://api.github.com/repos/symfony/validator/zipball/ca1d78e8677e966e307a63799677b64b194d735d", + "reference": "ca1d78e8677e966e307a63799677b64b194d735d", "shasum": "" }, "require": { @@ -13719,7 +13722,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.4.4" + "source": "https://github.com/symfony/validator/tree/v6.4.6" }, "funding": [ { @@ -13735,20 +13738,20 @@ "type": "tidelift" } ], - "time": "2024-02-22T20:27:10+00:00" + "time": "2024-03-27T22:00:14+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.4", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "b439823f04c98b84d4366c79507e9da6230944b1" + "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b439823f04c98b84d4366c79507e9da6230944b1", - "reference": "b439823f04c98b84d4366c79507e9da6230944b1", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/95bd2706a97fb875185b51ecaa6112ec184233d4", + "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4", "shasum": "" }, "require": { @@ -13804,7 +13807,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.4" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.6" }, "funding": [ { @@ -13820,20 +13823,20 @@ "type": "tidelift" } ], - "time": "2024-02-15T11:23:52+00:00" + "time": "2024-03-19T11:56:30+00:00" }, { "name": "symfony/var-exporter", - "version": "v6.4.4", + "version": "v6.4.6", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "0bd342e24aef49fc82a21bd4eedd3e665d177e5b" + "reference": "20888cf4d11de203613515cf0587828bf5af0fe7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/0bd342e24aef49fc82a21bd4eedd3e665d177e5b", - "reference": "0bd342e24aef49fc82a21bd4eedd3e665d177e5b", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/20888cf4d11de203613515cf0587828bf5af0fe7", + "reference": "20888cf4d11de203613515cf0587828bf5af0fe7", "shasum": "" }, "require": { @@ -13841,6 +13844,8 @@ "symfony/deprecation-contracts": "^2.5|^3" }, "require-dev": { + "symfony/property-access": "^6.4|^7.0", + "symfony/serializer": "^6.4|^7.0", "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", @@ -13879,7 +13884,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.4.4" + "source": "https://github.com/symfony/var-exporter/tree/v6.4.6" }, "funding": [ { @@ -13895,7 +13900,7 @@ "type": "tidelift" } ], - "time": "2024-02-26T08:37:45+00:00" + "time": "2024-03-20T21:07:14+00:00" }, { "name": "symfony/yaml", @@ -14151,16 +14156,16 @@ }, { "name": "unocha/common_design", - "version": "v9.3.4", + "version": "v9.4.0", "source": { "type": "git", "url": "https://github.com/UN-OCHA/common_design.git", - "reference": "ed463217ad183fb448dc4a7d09dda2457d2bac59" + "reference": "25cd18749497b8e02816f128e5994ce9e6d8a44f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/ed463217ad183fb448dc4a7d09dda2457d2bac59", - "reference": "ed463217ad183fb448dc4a7d09dda2457d2bac59", + "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/25cd18749497b8e02816f128e5994ce9e6d8a44f", + "reference": "25cd18749497b8e02816f128e5994ce9e6d8a44f", "shasum": "" }, "require": { @@ -14175,9 +14180,9 @@ "description": "OCHA Common Design base theme for Drupal 9+", "support": { "issues": "https://github.com/UN-OCHA/common_design/issues", - "source": "https://github.com/UN-OCHA/common_design/tree/v9.3.4" + "source": "https://github.com/UN-OCHA/common_design/tree/v9.4.0" }, - "time": "2024-02-26T09:54:32+00:00" + "time": "2024-03-19T09:01:42+00:00" }, { "name": "unocha/ocha_monitoring", @@ -14664,17 +14669,17 @@ }, { "name": "drupal/devel", - "version": "5.2.0", + "version": "5.2.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/devel.git", - "reference": "5.2.0" + "reference": "5.2.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/devel-5.2.0.zip", - "reference": "5.2.0", - "shasum": "9b7baa45a3caea3908643ef22882205ec2ed0da1" + "url": "https://ftp.drupal.org/files/projects/devel-5.2.1.zip", + "reference": "5.2.1", + "shasum": "793861751e01092fe8bc7c0cd47589ebea2bb8df" }, "require": { "doctrine/common": "^2.7 || ^3.4", @@ -14683,6 +14688,7 @@ "symfony/var-dumper": "^4 || ^5 || ^6" }, "conflict": { + "drush/drush": "<12.5.1", "kint-php/kint": "<3" }, "require-dev": { @@ -14694,8 +14700,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "5.2.0", - "datestamp": "1711280160", + "version": "5.2.1", + "datestamp": "1711328410", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" From 1251c5a54e9ff82fb7bf7eecc0d1387e4aa46cf2 Mon Sep 17 00:00:00 2001 From: Andy Footner Date: Mon, 8 Apr 2024 12:55:30 +0200 Subject: [PATCH 6/9] tests: adjust for consistency Refs: updates --- .github/workflows/composer-update.yml | 3 +- .github/workflows/run-tests.yml | 29 +++++++- composer.json | 1 + composer.lock | 103 +++++++++++++++++++++++++- 4 files changed, 127 insertions(+), 9 deletions(-) diff --git a/.github/workflows/composer-update.yml b/.github/workflows/composer-update.yml index 72d815a..4fa5cd9 100644 --- a/.github/workflows/composer-update.yml +++ b/.github/workflows/composer-update.yml @@ -18,5 +18,4 @@ jobs: patch_packages: 'drupal/*' patch_maintainers: ${{ secrets.DRUPAL_MAINTAINERS }} slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }} - slack_channel_name: ${{ secrets.SLACK_CHANNEL }} - flowdock_token: ${{ secrets.FLOWDOCK_TOKEN }} + slack_channel_name: ${{ vars.SLACK_CHANNEL }} diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 6db2284..9cf6ad5 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -197,7 +197,7 @@ jobs: comment-id: ${{ steps.fc.outputs.comment-id }} issue-number: ${{ github.event.pull_request.number }} body: | - ### Build output + ### Test run output #### Composer Validate `${{ steps.validate.outcome }}` #### PHP Lint `${{ steps.lint.outcome }}` #### Docker Build `${{ steps.build.outcome }}` @@ -208,6 +208,27 @@ jobs:
Software Versions ${{ steps.versions.outputs.stdout }}
+ +
Composer Validate + ${{ steps.validate.outputs.stdout }} + ${{ steps.validate.outputs.stderr }} +
+ +
PHP Lint + ${{ steps.lint.outputs.stdout }} + ${{ steps.lint.outputs.stderr }} +
+ +
PHPCS + ${{ steps.phpcs.outputs.stdout }} + ${{ steps.phpcs.outputs.stderr }} +
+ +
Tests + ${{ steps.tests.outputs.stdout }} + ${{ steps.tests.outputs.stderr }} +
+
Drupal Logs ${{ steps.dblog.outputs.stdout }}
@@ -220,7 +241,7 @@ jobs: if: ${{ !env.ACT && success() }} uses: slackapi/slack-github-action@v1.25.0 with: - channel-id: '${{ secrets.SLACK_CHANNEL }}' + channel-id: '${{ vars.SLACK_CHANNEL }}' payload: | { "text": "Tests passed for a pull request on ${{ github.repository }}", @@ -247,7 +268,7 @@ jobs: if: ${{ !env.ACT && failure() }} uses: slackapi/slack-github-action@v1.25.0 with: - channel-id: '${{ secrets.SLACK_CHANNEL }}' + channel-id: '${{ vars.SLACK_CHANNEL }}' payload: | { "text": "Tests failed for a pull request on ${{ github.repository }}", @@ -275,6 +296,6 @@ jobs: uses: cafuego/command-output@main with: run: | - docker compose -f tests/docker-compose.yml down + docker compose -f tests/docker-compose.yml down --rmi local -v env: fail-fast: true diff --git a/composer.json b/composer.json index f309a98..808320e 100644 --- a/composer.json +++ b/composer.json @@ -63,6 +63,7 @@ "drupal/coder": "^8.3", "drupal/config_filter": "^2.2", "drupal/devel": "^5.0", + "drupal/stage_file_proxy": "^2.1", "kint-php/kint": "^5", "mikey179/vfsstream": "^1.6", "phpcompatibility/php-compatibility": "^9.3", diff --git a/composer.lock b/composer.lock index 2803dc0..85878ff 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "85b35b08568c6a8335395f842a54d7ec", + "content-hash": "69822e38d04248e33c4ae4f909b553d4", "packages": [ { "name": "asm89/stack-cors", @@ -2565,7 +2565,7 @@ "shasum": "5cda4ba5f9f5ed0a94914dc4a9bd501208ae553f" }, "require": { - "drupal/core": "^9 || ^10" + "drupal/core": "^10" }, "type": "drupal-module", "extra": { @@ -3863,7 +3863,7 @@ "shasum": "fc8ea60619b6b4682bade340e13fb4565d3a7e0c" }, "require": { - "drupal/core": "^9.1 || ^10" + "drupal/core": "^10" }, "type": "drupal-module", "extra": { @@ -14720,6 +14720,103 @@ "slack": "https://drupal.slack.com/archives/C012WAW1MH6" } }, + { + "name": "drupal/stage_file_proxy", + "version": "2.1.4", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/stage_file_proxy.git", + "reference": "2.1.4" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-2.1.4.zip", + "reference": "2.1.4", + "shasum": "85f8451f123fcfb1b272f5a0cc11e6bd1673476c" + }, + "require": { + "drupal/core": "^9 || ^10", + "php": ">=8" + }, + "require-dev": { + "drupal/coder": "^8.3", + "drush/drush": "^11 || ^12" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.1.4", + "datestamp": "1706627704", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + }, + "drush": { + "services": { + "stage_file_proxy.drush.services.yml": "^11" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "scripts": { + "phpcs": [ + "vendor/bin/phpcs -p ." + ], + "phpcbf": [ + "vendor/bin/phpcbf -p ." + ], + "test": [ + "@phpcs" + ] + }, + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "BarisW", + "homepage": "https://www.drupal.org/user/107229" + }, + { + "name": "geek-merlin", + "homepage": "https://www.drupal.org/user/229048" + }, + { + "name": "greggles", + "homepage": "https://www.drupal.org/user/36762" + }, + { + "name": "markdorison", + "homepage": "https://www.drupal.org/user/346106" + }, + { + "name": "moshe weitzman", + "homepage": "https://www.drupal.org/user/23" + }, + { + "name": "msonnabaum", + "homepage": "https://www.drupal.org/user/75278" + }, + { + "name": "netaustin", + "homepage": "https://www.drupal.org/user/199298" + }, + { + "name": "robwilmshurst", + "homepage": "https://www.drupal.org/user/144488" + }, + { + "name": "smustgrave", + "homepage": "https://www.drupal.org/user/3252890" + } + ], + "description": "Provides stage_file_proxy module.", + "homepage": "https://www.drupal.org/project/stage_file_proxy", + "support": { + "source": "https://git.drupalcode.org/project/stage_file_proxy" + } + }, { "name": "kint-php/kint", "version": "5.1.0", From 6806836d302416ec02da384ac2526ee18945021b Mon Sep 17 00:00:00 2001 From: unocha-jenkins Date: Thu, 11 Apr 2024 06:37:43 +0000 Subject: [PATCH 7/9] chore: Update all outdated drupal/* unocha/* drush/* packages. --- composer.lock | 104 +++++++++++++++++++++++++------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/composer.lock b/composer.lock index a32b195..b1853aa 100644 --- a/composer.lock +++ b/composer.lock @@ -118,16 +118,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.303.2", + "version": "3.304.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "c087819351de027791d830ffc7f45195488ae988" + "reference": "2435079c3e1a08148d955de15ec090018114f35a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c087819351de027791d830ffc7f45195488ae988", - "reference": "c087819351de027791d830ffc7f45195488ae988", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2435079c3e1a08148d955de15ec090018114f35a", + "reference": "2435079c3e1a08148d955de15ec090018114f35a", "shasum": "" }, "require": { @@ -207,9 +207,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.303.2" + "source": "https://github.com/aws/aws-sdk-php/tree/3.304.2" }, - "time": "2024-04-03T18:08:21+00:00" + "time": "2024-04-10T18:05:32+00:00" }, { "name": "behat/mink", @@ -1337,25 +1337,25 @@ }, { "name": "consolidation/annotated-command", - "version": "4.9.2", + "version": "4.10.0", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "b5255dcbee1de95036185062a103dabc622224de" + "reference": "1e830ba908c9ffb1ba7ca056203531b27188812c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/b5255dcbee1de95036185062a103dabc622224de", - "reference": "b5255dcbee1de95036185062a103dabc622224de", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/1e830ba908c9ffb1ba7ca056203531b27188812c", + "reference": "1e830ba908c9ffb1ba7ca056203531b27188812c", "shasum": "" }, "require": { "consolidation/output-formatters": "^4.3.1", "php": ">=7.1.3", "psr/log": "^1 || ^2 || ^3", - "symfony/console": "^4.4.8 || ^5 || ^6", - "symfony/event-dispatcher": "^4.4.8 || ^5 || ^6", - "symfony/finder": "^4.4.8 || ^5 || ^6" + "symfony/console": "^4.4.8 || ^5 || ^6 || ^7", + "symfony/event-dispatcher": "^4.4.8 || ^5 || ^6 || ^7", + "symfony/finder": "^4.4.8 || ^5 || ^6 || ^7" }, "require-dev": { "composer-runtime-api": "^2.0", @@ -1387,9 +1387,9 @@ "description": "Initialize Symfony Console commands from annotated command class methods.", "support": { "issues": "https://github.com/consolidation/annotated-command/issues", - "source": "https://github.com/consolidation/annotated-command/tree/4.9.2" + "source": "https://github.com/consolidation/annotated-command/tree/4.10.0" }, - "time": "2023-12-26T14:30:50+00:00" + "time": "2024-04-05T21:05:39+00:00" }, { "name": "consolidation/config", @@ -1503,32 +1503,32 @@ }, { "name": "consolidation/log", - "version": "3.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/consolidation/log.git", - "reference": "caaad9d70dae54eb49002666f000e3c607066878" + "reference": "c27a3beb36137c141ccbce0d89f64befb243c015" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/log/zipball/caaad9d70dae54eb49002666f000e3c607066878", - "reference": "caaad9d70dae54eb49002666f000e3c607066878", + "url": "https://api.github.com/repos/consolidation/log/zipball/c27a3beb36137c141ccbce0d89f64befb243c015", + "reference": "c27a3beb36137c141ccbce0d89f64befb243c015", "shasum": "" }, "require": { "php": ">=8.0.0", "psr/log": "^3", - "symfony/console": "^5 || ^6" + "symfony/console": "^5 || ^6 || ^7" }, "require-dev": { - "phpunit/phpunit": ">=7.5.20", + "phpunit/phpunit": "^7.5.20 || ^8 || ^9", "squizlabs/php_codesniffer": "^3", "yoast/phpunit-polyfills": "^0.2.0" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "2.x-dev" + "platform": { + "php": "8.2.17" } }, "autoload": { @@ -1549,9 +1549,9 @@ "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.", "support": { "issues": "https://github.com/consolidation/log/issues", - "source": "https://github.com/consolidation/log/tree/3.0.0" + "source": "https://github.com/consolidation/log/tree/3.1.0" }, - "time": "2022-04-05T16:53:32+00:00" + "time": "2024-04-04T23:50:25+00:00" }, { "name": "consolidation/output-formatters", @@ -1737,23 +1737,23 @@ }, { "name": "consolidation/site-alias", - "version": "4.0.1", + "version": "4.1.0", "source": { "type": "git", "url": "https://github.com/consolidation/site-alias.git", - "reference": "b0eeb8c8f3d54d072824ee31b5e00cb5181f91c5" + "reference": "1056ceb93f6aafe6f7600d7bbe1b62b8488abccf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/site-alias/zipball/b0eeb8c8f3d54d072824ee31b5e00cb5181f91c5", - "reference": "b0eeb8c8f3d54d072824ee31b5e00cb5181f91c5", + "url": "https://api.github.com/repos/consolidation/site-alias/zipball/1056ceb93f6aafe6f7600d7bbe1b62b8488abccf", + "reference": "1056ceb93f6aafe6f7600d7bbe1b62b8488abccf", "shasum": "" }, "require": { - "consolidation/config": "^1.2.1 || ^2", + "consolidation/config": "^1.2.1 || ^2 || ^3", "php": ">=7.4", - "symfony/filesystem": "^5.4 || ^6", - "symfony/finder": "^5 || ^6" + "symfony/filesystem": "^5.4 || ^6 || ^7", + "symfony/finder": "^5 || ^6 || ^7" }, "require-dev": { "php-coveralls/php-coveralls": "^2.4.2", @@ -1790,30 +1790,30 @@ "description": "Manage alias records for local and remote sites.", "support": { "issues": "https://github.com/consolidation/site-alias/issues", - "source": "https://github.com/consolidation/site-alias/tree/4.0.1" + "source": "https://github.com/consolidation/site-alias/tree/4.1.0" }, - "time": "2023-04-29T17:18:10+00:00" + "time": "2024-04-05T15:58:04+00:00" }, { "name": "consolidation/site-process", - "version": "5.3.0", + "version": "5.4.0", "source": { "type": "git", "url": "https://github.com/consolidation/site-process.git", - "reference": "5e8eff50fd0015e7ca0b6ce4082cacef012f2f77" + "reference": "7ab3ffe4195a89b8dc334ea22e7881abe79ffd9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/site-process/zipball/5e8eff50fd0015e7ca0b6ce4082cacef012f2f77", - "reference": "5e8eff50fd0015e7ca0b6ce4082cacef012f2f77", + "url": "https://api.github.com/repos/consolidation/site-process/zipball/7ab3ffe4195a89b8dc334ea22e7881abe79ffd9a", + "reference": "7ab3ffe4195a89b8dc334ea22e7881abe79ffd9a", "shasum": "" }, "require": { - "consolidation/config": "^2", + "consolidation/config": "^2 || ^3", "consolidation/site-alias": "^3 || ^4", "php": ">=8.0.14", - "symfony/console": "^5.4 || ^6", - "symfony/process": "^6" + "symfony/console": "^5.4 || ^6 || ^7", + "symfony/process": "^6 || ^7" }, "require-dev": { "phpunit/phpunit": "^9", @@ -1847,9 +1847,9 @@ "description": "A thin wrapper around the Symfony Process Component that allows applications to use the Site Alias library to specify the target for a remote call.", "support": { "issues": "https://github.com/consolidation/site-process/issues", - "source": "https://github.com/consolidation/site-process/tree/5.3.0" + "source": "https://github.com/consolidation/site-process/tree/5.4.0" }, - "time": "2024-04-01T12:42:12+00:00" + "time": "2024-04-06T00:00:28+00:00" }, { "name": "cweagans/composer-patches", @@ -2565,7 +2565,7 @@ "shasum": "5cda4ba5f9f5ed0a94914dc4a9bd501208ae553f" }, "require": { - "drupal/core": "^10" + "drupal/core": "^9 || ^10" }, "type": "drupal-module", "extra": { @@ -3863,7 +3863,7 @@ "shasum": "fc8ea60619b6b4682bade340e13fb4565d3a7e0c" }, "require": { - "drupal/core": "^10" + "drupal/core": "^9.1 || ^10" }, "type": "drupal-module", "extra": { @@ -4131,7 +4131,7 @@ "extra": { "drupal": { "version": "8.x-1.12", - "datestamp": "1696776683", + "datestamp": "1712319355", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -8748,16 +8748,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.18", + "version": "9.6.19", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04" + "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04", - "reference": "32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8", + "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8", "shasum": "" }, "require": { @@ -8831,7 +8831,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.18" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19" }, "funding": [ { @@ -8847,7 +8847,7 @@ "type": "tidelift" } ], - "time": "2024-03-21T12:07:32+00:00" + "time": "2024-04-05T04:35:58+00:00" }, { "name": "psr/cache", From c8f37239f944cc1b4f65056987c577ede1436547 Mon Sep 17 00:00:00 2001 From: Andy Footner Date: Thu, 11 Apr 2024 11:44:25 +0200 Subject: [PATCH 8/9] updates: update lagging packages Refs: OPS-10210 --- composer.json | 2 +- composer.lock | 54 ++++++++++++++++++++------------------------------- 2 files changed, 22 insertions(+), 34 deletions(-) diff --git a/composer.json b/composer.json index 808320e..ffa0c54 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ ], "require": { "php": ">=8.1", - "composer/installers": "^1.12", + "composer/installers": "^2", "cweagans/composer-patches": "^1.7", "drupal/admin_denied": "^2.0", "drupal/allowed_formats": "^3", diff --git a/composer.lock b/composer.lock index b1853aa..414e746 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "69822e38d04248e33c4ae4f909b553d4", + "content-hash": "bbfbd1b1e008f0061b3fad6e17056e27", "packages": [ { "name": "asm89/stack-cors", @@ -819,39 +819,37 @@ }, { "name": "composer/installers", - "version": "v1.12.0", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "d20a64ed3c94748397ff5973488761b22f6d3f19" + "reference": "c29dc4b93137acb82734f672c37e029dfbd95b35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/d20a64ed3c94748397ff5973488761b22f6d3f19", - "reference": "d20a64ed3c94748397ff5973488761b22f6d3f19", + "url": "https://api.github.com/repos/composer/installers/zipball/c29dc4b93137acb82734f672c37e029dfbd95b35", + "reference": "c29dc4b93137acb82734f672c37e029dfbd95b35", "shasum": "" }, "require": { - "composer-plugin-api": "^1.0 || ^2.0" - }, - "replace": { - "roundcube/plugin-installer": "*", - "shama/baton": "*" + "composer-plugin-api": "^1.0 || ^2.0", + "php": "^7.2 || ^8.0" }, "require-dev": { "composer/composer": "1.6.* || ^2.0", "composer/semver": "^1 || ^3", "phpstan/phpstan": "^0.12.55", "phpstan/phpstan-phpunit": "^0.12.16", - "symfony/phpunit-bridge": "^4.2 || ^5", - "symfony/process": "^2.3" + "symfony/phpunit-bridge": "^5.3", + "symfony/process": "^5" }, "type": "composer-plugin", "extra": { "class": "Composer\\Installers\\Plugin", "branch-alias": { - "dev-main": "1.x-dev" - } + "dev-main": "2.x-dev" + }, + "plugin-modifies-install-path": true }, "autoload": { "psr-4": { @@ -872,7 +870,6 @@ "description": "A multi-framework Composer library installer", "homepage": "https://composer.github.io/installers/", "keywords": [ - "Craft", "Dolibarr", "Eliasis", "Hurad", @@ -893,7 +890,6 @@ "Whmcs", "WolfCMS", "agl", - "aimeos", "annotatecms", "attogram", "bitrix", @@ -912,7 +908,6 @@ "grav", "installer", "itop", - "joomla", "known", "kohana", "laravel", @@ -921,6 +916,7 @@ "magento", "majima", "mako", + "matomo", "mediawiki", "miaoxing", "modulework", @@ -940,9 +936,7 @@ "silverstripe", "sydes", "sylius", - "symfony", "tastyigniter", - "typo3", "wordpress", "yawik", "zend", @@ -950,7 +944,7 @@ ], "support": { "issues": "https://github.com/composer/installers/issues", - "source": "https://github.com/composer/installers/tree/v1.12.0" + "source": "https://github.com/composer/installers/tree/v2.2.0" }, "funding": [ { @@ -966,7 +960,7 @@ "type": "tidelift" } ], - "time": "2021-09-13T08:19:44+00:00" + "time": "2022-08-20T06:45:11+00:00" }, { "name": "composer/metadata-minifier", @@ -2565,7 +2559,7 @@ "shasum": "5cda4ba5f9f5ed0a94914dc4a9bd501208ae553f" }, "require": { - "drupal/core": "^9 || ^10" + "drupal/core": "^10" }, "type": "drupal-module", "extra": { @@ -3863,7 +3857,7 @@ "shasum": "fc8ea60619b6b4682bade340e13fb4565d3a7e0c" }, "require": { - "drupal/core": "^9.1 || ^10" + "drupal/core": "^10" }, "type": "drupal-module", "extra": { @@ -15173,17 +15167,11 @@ }, { "name": "weitzman/drupal-test-traits", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", - "url": "git@gitlab.com:weitzman/drupal-test-traits.git", - "reference": "e40ee4e8e41f229d297c5e714fd63c4a00c633a2" - }, - "dist": { - "type": "zip", - "url": "https://gitlab.com/api/v4/projects/weitzman%2Fdrupal-test-traits/repository/archive.zip?sha=e40ee4e8e41f229d297c5e714fd63c4a00c633a2", - "reference": "e40ee4e8e41f229d297c5e714fd63c4a00c633a2", - "shasum": "" + "url": "https://git.drupalcode.org/project/dtt/", + "reference": "9ef44f5cd5eef942c84f2d2ffd21734944d566f8" }, "require": { "php": ">=8.1" @@ -15222,7 +15210,7 @@ } ], "description": "Traits for testing Drupal sites that have user content (versus unpopulated sites).", - "time": "2023-04-23T03:17:53+00:00" + "time": "2023-10-13T22:55:15+00:00" } ], "aliases": [], From 6f020aec2f4ab5cb8a784e8e6bfdd1b1b2991fb3 Mon Sep 17 00:00:00 2001 From: Peter Lieverdink Date: Mon, 15 Apr 2024 11:38:08 +1000 Subject: [PATCH 9/9] chore: Add Amazon SES support and config to be managed via Ansible. (#250) * chore: Add Amazon SES support and config to be managed via Ansible. Refs: OPS-9523 * fix: Do some yak shaving to update the lock file. --- .../amazon_ses-3417090-cron-queue-14.patch | 18 ++++++++++++++ composer.json | 3 ++- composer.lock | 24 +++++++++---------- composer.patches.json | 3 +++ config/amazon_ses.settings.yml | 3 +++ config/aws.profile.amazon_ses.yml | 12 ++++++++++ config/aws.settings.yml | 1 + config/core.extension.yml | 3 +++ config/mailsystem.settings.yml | 6 +++++ 9 files changed, 59 insertions(+), 14 deletions(-) create mode 100644 PATCHES/amazon_ses-3417090-cron-queue-14.patch create mode 100644 config/amazon_ses.settings.yml create mode 100644 config/aws.profile.amazon_ses.yml create mode 100644 config/aws.settings.yml create mode 100644 config/mailsystem.settings.yml diff --git a/PATCHES/amazon_ses-3417090-cron-queue-14.patch b/PATCHES/amazon_ses-3417090-cron-queue-14.patch new file mode 100644 index 0000000..627b817 --- /dev/null +++ b/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; + } diff --git a/composer.json b/composer.json index ffa0c54..a4b3ca8 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,8 @@ "cweagans/composer-patches": "^1.7", "drupal/admin_denied": "^2.0", "drupal/allowed_formats": "^3", - "drupal/amazon_ses": "^3.0", + "drupal/amazon_ses": "^3", + "drupal/aws": "dev-2.0.x", "drupal/bcc": "^4", "drupal/classy": "^1.0", "drupal/components": "^3.0@beta", diff --git a/composer.lock b/composer.lock index 414e746..9c81fb2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "bbfbd1b1e008f0061b3fad6e17056e27", + "content-hash": "5c6c46988e865883ab735c12be2d20d0", "packages": [ { "name": "asm89/stack-cors", @@ -2483,17 +2483,11 @@ }, { "name": "drupal/aws", - "version": "2.0.3", + "version": "dev-2.0.x", "source": { "type": "git", "url": "https://git.drupalcode.org/project/aws.git", - "reference": "2.0.3" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/aws-2.0.3.zip", - "reference": "2.0.3", - "shasum": "683b5ed0698bb6c64db8a34b42fff2571807becc" + "reference": "5c8371feefd3ea641cca486925e3db9e628b07ba" }, "require": { "aws/aws-sdk-php": "^3.54", @@ -2501,12 +2495,15 @@ }, "type": "drupal-module", "extra": { + "branch-alias": { + "dev-2.0.x": "2.0.x-dev" + }, "drupal": { - "version": "2.0.3", - "datestamp": "1671308573", + "version": "2.0.3+4-dev", + "datestamp": "1690752016", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "Dev releases are not covered by Drupal security advisories." } } }, @@ -15216,6 +15213,7 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { + "drupal/aws": 20, "drupal/components": 10, "drupal/config_split": 5, "drupal/entity_usage": 10, diff --git a/composer.patches.json b/composer.patches.json index d221cb9..5294b6e 100644 --- a/composer.patches.json +++ b/composer.patches.json @@ -1,5 +1,8 @@ { "patches": { + "drupal/amazon_ses": { + "Cron fails on amazon_ses when not configured": "PATCHES/amazon_ses-3417090-cron-queue-14.patch" + }, "drupal/core" : { "https://www.drupal.org/project/drupal/issues/3143617": "https://www.drupal.org/files/issues/2020-07-07/3143617-28_0.patch" }, diff --git a/config/amazon_ses.settings.yml b/config/amazon_ses.settings.yml new file mode 100644 index 0000000..71871fc --- /dev/null +++ b/config/amazon_ses.settings.yml @@ -0,0 +1,3 @@ +from_address: ops@reliefweb.int +throttle: true +queue: false diff --git a/config/aws.profile.amazon_ses.yml b/config/aws.profile.amazon_ses.yml new file mode 100644 index 0000000..0b0a266 --- /dev/null +++ b/config/aws.profile.amazon_ses.yml @@ -0,0 +1,12 @@ +uuid: 5e4ba0be-7f26-41ac-aa7d-b55feb6afce9 +langcode: en +status: true +dependencies: { } +id: amazon_ses +name: 'Amazon SES' +default: 1 +aws_role_arn: '' +aws_access_key_id: '' +aws_secret_access_key: '' +region: us-east-1 +encryption_profile: '' diff --git a/config/aws.settings.yml b/config/aws.settings.yml new file mode 100644 index 0000000..2a115ac --- /dev/null +++ b/config/aws.settings.yml @@ -0,0 +1 @@ +services: { } diff --git a/config/core.extension.yml b/config/core.extension.yml index 4efb527..6731f59 100644 --- a/config/core.extension.yml +++ b/config/core.extension.yml @@ -3,6 +3,8 @@ _core: module: admin_denied: 0 allowed_formats: 0 + amazon_ses: 0 + aws: 0 bcc: 0 block: 0 breakpoint: 0 @@ -32,6 +34,7 @@ module: layout_paragraphs: 0 link: 0 linked_responsive_image_media_formatter: 0 + mailsystem: 0 maintenance200: 0 media: 0 media_library: 0 diff --git a/config/mailsystem.settings.yml b/config/mailsystem.settings.yml new file mode 100644 index 0000000..77640b6 --- /dev/null +++ b/config/mailsystem.settings.yml @@ -0,0 +1,6 @@ +_core: + default_config_hash: IhwTepsVwtbtbcT5GzQKhCXDCRvbk3MNkWqPiuiZ10s +theme: current +defaults: + sender: php_mail + formatter: php_mail