From 5a425f571de88f8751ab4f9c3b79ea8c57a0a915 Mon Sep 17 00:00:00 2001 From: Andy Footner Date: Thu, 2 Nov 2023 16:48:00 +0100 Subject: [PATCH] chore: remove patch and run weekly updates Refs: OPS-9747 updates --- PATCHES/core-css-js-aggregation-3376927.patch | 15 -- composer.lock | 194 +++++++++--------- composer.patches.json | 3 +- 3 files changed, 98 insertions(+), 114 deletions(-) delete mode 100644 PATCHES/core-css-js-aggregation-3376927.patch diff --git a/PATCHES/core-css-js-aggregation-3376927.patch b/PATCHES/core-css-js-aggregation-3376927.patch deleted file mode 100644 index c2f3ca7e9..000000000 --- a/PATCHES/core-css-js-aggregation-3376927.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/core/modules/system/src/Controller/AssetControllerBase.php b/core/modules/system/src/Controller/AssetControllerBase.php -index 620b2ecccf..cce4c397cc 100644 ---- a/core/modules/system/src/Controller/AssetControllerBase.php -+++ b/core/modules/system/src/Controller/AssetControllerBase.php -@@ -191,10 +191,6 @@ public function deliver(Request $request, string $file_name) { - // referenced in cached HTML. - if (hash_equals($generated_hash, $received_hash)) { - $uri = $this->dumper->dumpToUri($data, $this->assetType, $uri); -- $state_key = 'drupal_' . $this->assetType . '_cache_files'; -- $files = $this->state()->get($state_key, []); -- $files[] = $uri; -- $this->state()->set($state_key, $files); - } - return new Response($data, 200, [ - 'Cache-control' => static::CACHE_CONTROL, diff --git a/composer.lock b/composer.lock index cea4599d7..859285015 100644 --- a/composer.lock +++ b/composer.lock @@ -2429,17 +2429,17 @@ }, { "name": "drupal/config_filter", - "version": "2.5.0", + "version": "2.6.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_filter.git", - "reference": "8.x-2.5" + "reference": "8.x-2.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-2.5.zip", - "reference": "8.x-2.5", - "shasum": "a509ec432b0560fbba853b52e74d71cede5f6bdf" + "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-2.6.zip", + "reference": "8.x-2.6", + "shasum": "fd1a057a402436fc906c63bf0a74722f73b9b155" }, "require": { "drupal/core": "^8.8 || ^9 || ^10" @@ -2453,8 +2453,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.5", - "datestamp": "1698096457", + "version": "8.x-2.6", + "datestamp": "1698308577", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2498,17 +2498,17 @@ }, { "name": "drupal/config_split", - "version": "2.0.0-rc4", + "version": "2.0.0-rc5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_split.git", - "reference": "2.0.0-rc4" + "reference": "2.0.0-rc5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_split-2.0.0-rc4.zip", - "reference": "2.0.0-rc4", - "shasum": "d4c06efbadd34793b0c9b71772162057afa58111" + "url": "https://ftp.drupal.org/files/projects/config_split-2.0.0-rc5.zip", + "reference": "2.0.0-rc5", + "shasum": "6c7240086bb65c668f2cf32f59f2e1414ad6afbe" }, "require": { "drupal/core": "^8.8 || ^9 || ^10" @@ -2526,8 +2526,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0-rc4", - "datestamp": "1662235380", + "version": "2.0.0-rc5", + "datestamp": "1698624439", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -2621,16 +2621,16 @@ }, { "name": "drupal/core", - "version": "10.1.5", + "version": "10.1.6", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "1272c35d547e844e7ebf3fe5513542291cda8cec" + "reference": "33695caf467e3e1e8c75d42215df57bee31be9ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/1272c35d547e844e7ebf3fe5513542291cda8cec", - "reference": "1272c35d547e844e7ebf3fe5513542291cda8cec", + "url": "https://api.github.com/repos/drupal/core/zipball/33695caf467e3e1e8c75d42215df57bee31be9ec", + "reference": "33695caf467e3e1e8c75d42215df57bee31be9ec", "shasum": "" }, "require": { @@ -2775,13 +2775,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.1.5" + "source": "https://github.com/drupal/core/tree/10.1.6" }, - "time": "2023-10-04T21:37:59+00:00" + "time": "2023-11-01T11:59:20+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.1.5", + "version": "10.1.6", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -2825,22 +2825,22 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.1.5" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.1.6" }, "time": "2023-04-30T16:15:32+00:00" }, { "name": "drupal/core-dev", - "version": "10.1.5", + "version": "10.1.6", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", - "reference": "e11a86bc8c037e67c7c5c974fbabe051bbcdcc81" + "reference": "5d02df4f05f5033e7d8bf4098efa55cc0847e2b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-dev/zipball/e11a86bc8c037e67c7c5c974fbabe051bbcdcc81", - "reference": "e11a86bc8c037e67c7c5c974fbabe051bbcdcc81", + "url": "https://api.github.com/repos/drupal/core-dev/zipball/5d02df4f05f5033e7d8bf4098efa55cc0847e2b9", + "reference": "5d02df4f05f5033e7d8bf4098efa55cc0847e2b9", "shasum": "" }, "require": { @@ -2848,7 +2848,7 @@ "behat/mink-browserkit-driver": "^2.1", "behat/mink-selenium2-driver": "^1.4", "colinodell/psr-testlogger": "^1.2", - "composer/composer": "^2.4", + "composer/composer": "^2.6.4", "drupal/coder": "^8.3.10", "instaclick/php-webdriver": "^1.4.1", "justinrainbow/json-schema": "^5.2", @@ -2879,22 +2879,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.1.5" + "source": "https://github.com/drupal/core-dev/tree/10.1.6" }, - "time": "2023-05-25T11:39:24+00:00" + "time": "2023-10-05T21:10:12+00:00" }, { "name": "drupal/core-recommended", - "version": "10.1.5", + "version": "10.1.6", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "2c5cf420ddb06f3e9b624d168b724ca1c7c326e2" + "reference": "13f5968854fe8bc02e659d8a4facc04a1a576ce5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/2c5cf420ddb06f3e9b624d168b724ca1c7c326e2", - "reference": "2c5cf420ddb06f3e9b624d168b724ca1c7c326e2", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/13f5968854fe8bc02e659d8a4facc04a1a576ce5", + "reference": "13f5968854fe8bc02e659d8a4facc04a1a576ce5", "shasum": "" }, "require": { @@ -2903,7 +2903,7 @@ "doctrine/annotations": "~1.14.3", "doctrine/deprecations": "~v1.1.1", "doctrine/lexer": "~2.1.0", - "drupal/core": "10.1.5", + "drupal/core": "10.1.6", "egulias/email-validator": "~4.0.1", "guzzlehttp/guzzle": "~7.7.0", "guzzlehttp/psr7": "~2.5.0", @@ -2960,9 +2960,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.1.5" + "source": "https://github.com/drupal/core-recommended/tree/10.1.6" }, - "time": "2023-10-04T21:37:59+00:00" + "time": "2023-11-01T11:59:20+00:00" }, { "name": "drupal/ctools", @@ -4494,17 +4494,17 @@ }, { "name": "drupal/svg_image", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/svg_image.git", - "reference": "3.0.1" + "reference": "3.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/svg_image-3.0.1.zip", - "reference": "3.0.1", - "shasum": "6e0f1f305e0db535257780e647f6163cfdda8263" + "url": "https://ftp.drupal.org/files/projects/svg_image-3.0.2.zip", + "reference": "3.0.2", + "shasum": "77906ae731878b68a181f82b073617b798e5f110" }, "require": { "drupal/core": "^10", @@ -4513,8 +4513,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.1", - "datestamp": "1676292042", + "version": "3.0.2", + "datestamp": "1698471266", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5727,16 +5727,16 @@ }, { "name": "google/protobuf", - "version": "v3.24.4", + "version": "v3.25.0", "source": { "type": "git", "url": "https://github.com/protocolbuffers/protobuf-php.git", - "reference": "672d69e25f71b9364fdf1810eb8a8573defdc404" + "reference": "e5a021e653ee3a7a78760caefa605b4ec31bba80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/672d69e25f71b9364fdf1810eb8a8573defdc404", - "reference": "672d69e25f71b9364fdf1810eb8a8573defdc404", + "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/e5a021e653ee3a7a78760caefa605b4ec31bba80", + "reference": "e5a021e653ee3a7a78760caefa605b4ec31bba80", "shasum": "" }, "require": { @@ -5765,9 +5765,9 @@ "proto" ], "support": { - "source": "https://github.com/protocolbuffers/protobuf-php/tree/v3.24.4" + "source": "https://github.com/protocolbuffers/protobuf-php/tree/v3.25.0" }, - "time": "2023-10-04T17:22:47+00:00" + "time": "2023-11-01T22:12:38+00:00" }, { "name": "grasmash/expander", @@ -7257,16 +7257,16 @@ }, { "name": "nette/utils", - "version": "v4.0.2", + "version": "v4.0.3", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "cead6637226456b35e1175cc53797dd585d85545" + "reference": "a9d127dd6a203ce6d255b2e2db49759f7506e015" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/cead6637226456b35e1175cc53797dd585d85545", - "reference": "cead6637226456b35e1175cc53797dd585d85545", + "url": "https://api.github.com/repos/nette/utils/zipball/a9d127dd6a203ce6d255b2e2db49759f7506e015", + "reference": "a9d127dd6a203ce6d255b2e2db49759f7506e015", "shasum": "" }, "require": { @@ -7337,9 +7337,9 @@ ], "support": { "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v4.0.2" + "source": "https://github.com/nette/utils/tree/v4.0.3" }, - "time": "2023-09-19T11:58:07+00:00" + "time": "2023-10-29T21:02:13+00:00" }, { "name": "nikic/php-parser", @@ -8498,16 +8498,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.39", + "version": "1.10.40", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "d9dedb0413f678b4d03cbc2279a48f91592c97c4" + "reference": "93c84b5bf7669920d823631e39904d69b9c7dc5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d9dedb0413f678b4d03cbc2279a48f91592c97c4", - "reference": "d9dedb0413f678b4d03cbc2279a48f91592c97c4", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/93c84b5bf7669920d823631e39904d69b9c7dc5d", + "reference": "93c84b5bf7669920d823631e39904d69b9c7dc5d", "shasum": "" }, "require": { @@ -8556,7 +8556,7 @@ "type": "tidelift" } ], - "time": "2023-10-17T15:46:26+00:00" + "time": "2023-10-30T14:48:31+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -11915,16 +11915,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.3.6", + "version": "v6.3.7", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "c186627f52febe09c6d5270b04f8462687a250a6" + "reference": "59d1837d5d992d16c2628cd0d6b76acf8d69b33e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/c186627f52febe09c6d5270b04f8462687a250a6", - "reference": "c186627f52febe09c6d5270b04f8462687a250a6", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/59d1837d5d992d16c2628cd0d6b76acf8d69b33e", + "reference": "59d1837d5d992d16c2628cd0d6b76acf8d69b33e", "shasum": "" }, "require": { @@ -11972,7 +11972,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.3.6" + "source": "https://github.com/symfony/http-foundation/tree/v6.3.7" }, "funding": [ { @@ -11988,20 +11988,20 @@ "type": "tidelift" } ], - "time": "2023-10-17T11:32:53+00:00" + "time": "2023-10-28T23:55:27+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.3.6", + "version": "v6.3.7", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "4945f5001b06ff9080cd3d8f1f9f069094c0d156" + "reference": "6d4098095f93279d9536a0e9124439560cc764d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4945f5001b06ff9080cd3d8f1f9f069094c0d156", - "reference": "4945f5001b06ff9080cd3d8f1f9f069094c0d156", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6d4098095f93279d9536a0e9124439560cc764d0", + "reference": "6d4098095f93279d9536a0e9124439560cc764d0", "shasum": "" }, "require": { @@ -12085,7 +12085,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.3.6" + "source": "https://github.com/symfony/http-kernel/tree/v6.3.7" }, "funding": [ { @@ -12101,20 +12101,20 @@ "type": "tidelift" } ], - "time": "2023-10-21T13:12:51+00:00" + "time": "2023-10-29T14:31:45+00:00" }, { "name": "symfony/lock", - "version": "v6.3.6", + "version": "v6.3.7", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", - "reference": "714c52173dd3720ae63e564c4ec7fd03eb8a635a" + "reference": "7e5d1412827aa97e90f9af9495d452f0b9465a85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/lock/zipball/714c52173dd3720ae63e564c4ec7fd03eb8a635a", - "reference": "714c52173dd3720ae63e564c4ec7fd03eb8a635a", + "url": "https://api.github.com/repos/symfony/lock/zipball/7e5d1412827aa97e90f9af9495d452f0b9465a85", + "reference": "7e5d1412827aa97e90f9af9495d452f0b9465a85", "shasum": "" }, "require": { @@ -12164,7 +12164,7 @@ "semaphore" ], "support": { - "source": "https://github.com/symfony/lock/tree/v6.3.6" + "source": "https://github.com/symfony/lock/tree/v6.3.7" }, "funding": [ { @@ -12180,7 +12180,7 @@ "type": "tidelift" } ], - "time": "2023-10-12T15:02:41+00:00" + "time": "2023-10-28T23:55:27+00:00" }, { "name": "symfony/mime", @@ -13557,16 +13557,16 @@ }, { "name": "symfony/serializer", - "version": "v6.3.6", + "version": "v6.3.7", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "8c5fb7144889839751ad9680cf4f183f60f8fbce" + "reference": "641472dd3d6dc3c4d0fdd1496ebd1b55c72e43d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/8c5fb7144889839751ad9680cf4f183f60f8fbce", - "reference": "8c5fb7144889839751ad9680cf4f183f60f8fbce", + "url": "https://api.github.com/repos/symfony/serializer/zipball/641472dd3d6dc3c4d0fdd1496ebd1b55c72e43d9", + "reference": "641472dd3d6dc3c4d0fdd1496ebd1b55c72e43d9", "shasum": "" }, "require": { @@ -13631,7 +13631,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.3.6" + "source": "https://github.com/symfony/serializer/tree/v6.3.7" }, "funding": [ { @@ -13647,7 +13647,7 @@ "type": "tidelift" } ], - "time": "2023-10-17T11:32:53+00:00" + "time": "2023-10-26T18:15:14+00:00" }, { "name": "symfony/service-contracts", @@ -13971,16 +13971,16 @@ }, { "name": "symfony/validator", - "version": "v6.3.6", + "version": "v6.3.7", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "254290aa13d591883eb36327cbe80689cee38ffb" + "reference": "9cc736663fa5839b9710ac2c303bb0b951014fc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/254290aa13d591883eb36327cbe80689cee38ffb", - "reference": "254290aa13d591883eb36327cbe80689cee38ffb", + "url": "https://api.github.com/repos/symfony/validator/zipball/9cc736663fa5839b9710ac2c303bb0b951014fc1", + "reference": "9cc736663fa5839b9710ac2c303bb0b951014fc1", "shasum": "" }, "require": { @@ -14047,7 +14047,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.3.6" + "source": "https://github.com/symfony/validator/tree/v6.3.7" }, "funding": [ { @@ -14063,7 +14063,7 @@ "type": "tidelift" } ], - "time": "2023-10-20T16:20:17+00:00" + "time": "2023-10-28T23:11:45+00:00" }, { "name": "symfony/var-dumper", @@ -14225,16 +14225,16 @@ }, { "name": "symfony/yaml", - "version": "v6.3.3", + "version": "v6.3.7", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "e23292e8c07c85b971b44c1c4b87af52133e2add" + "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/e23292e8c07c85b971b44c1c4b87af52133e2add", - "reference": "e23292e8c07c85b971b44c1c4b87af52133e2add", + "url": "https://api.github.com/repos/symfony/yaml/zipball/9758b6c69d179936435d0ffb577c3708d57e38a8", + "reference": "9758b6c69d179936435d0ffb577c3708d57e38a8", "shasum": "" }, "require": { @@ -14277,7 +14277,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.3.3" + "source": "https://github.com/symfony/yaml/tree/v6.3.7" }, "funding": [ { @@ -14293,7 +14293,7 @@ "type": "tidelift" } ], - "time": "2023-07-31T07:08:24+00:00" + "time": "2023-10-28T23:31:00+00:00" }, { "name": "theseer/tokenizer", @@ -15422,5 +15422,5 @@ "php": ">=8.2" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/composer.patches.json b/composer.patches.json index 6e7eb86db..eaa372897 100644 --- a/composer.patches.json +++ b/composer.patches.json @@ -3,8 +3,7 @@ "drupal/core" : { "https://www.drupal.org/project/drupal/issues/3047110": "PATCHES/core--drupal--3047110-taxonomy-term-moderation-class.patch", "https://www.drupal.org/project/drupal/issues/3008292": "PATCHES/core--drupal--3008292-image-upload-validators.patch", - "https://www.drupal.org/project/drupal/issues/3143617": "PATCHES/core--drupal--3143617-pager-parameter.patch", - "https://www.drupal.org/project/drupal/issues/3376927": "PATCHES/core-css-js-aggregation-3376927.patch" + "https://www.drupal.org/project/drupal/issues/3143617": "PATCHES/core--drupal--3143617-pager-parameter.patch" }, "drupal/guidelines": { "Drupal 10 compatibility": "PATCHES/guidelines-drupal-10-compatibility.patch"