From 7221e97532f9250a526847236d37770c1c0084d2 Mon Sep 17 00:00:00 2001 From: Marc Berger <107938318+codechefmarc@users.noreply.github.com> Date: Thu, 14 Nov 2024 08:04:57 -0800 Subject: [PATCH 1/5] Update Lando config to work with PHP 8.3 (#1684) * Update Lando config to work with PHP 8.3. --- lando/default.lando.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lando/default.lando.yml b/lando/default.lando.yml index 4992485e9..2f1b05fab 100644 --- a/lando/default.lando.yml +++ b/lando/default.lando.yml @@ -2,8 +2,8 @@ name: suhumsci recipe: drupal9 config: webroot: docroot - php: '8.2' - composer_version: '2.4.0' + php: '8.3' + composer_version: '2.8.2' # M1 MacOS specific settings xdebug: false index: false From 59f3e452983d874a6593e1123551a52ebdec3f5a Mon Sep 17 00:00:00 2001 From: CircleCI Date: Fri, 15 Nov 2024 14:08:42 +0000 Subject: [PATCH 2/5] Updated dependencies --- composer.lock | 413 +++++++++++---------- docroot/sites/default/default.settings.php | 2 + 2 files changed, 214 insertions(+), 201 deletions(-) diff --git a/composer.lock b/composer.lock index bd141da88..b7eeb4301 100644 --- a/composer.lock +++ b/composer.lock @@ -371,16 +371,16 @@ }, { "name": "commerceguys/addressing", - "version": "v2.2.2", + "version": "v2.2.3", "source": { "type": "git", "url": "https://github.com/commerceguys/addressing.git", - "reference": "4d23e46ea32534268ea121453c93ceda2bc3ee69" + "reference": "ca69b9cc502867111e585f7c627894ffac6f328a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/commerceguys/addressing/zipball/4d23e46ea32534268ea121453c93ceda2bc3ee69", - "reference": "4d23e46ea32534268ea121453c93ceda2bc3ee69", + "url": "https://api.github.com/repos/commerceguys/addressing/zipball/ca69b9cc502867111e585f7c627894ffac6f328a", + "reference": "ca69b9cc502867111e585f7c627894ffac6f328a", "shasum": "" }, "require": { @@ -429,9 +429,9 @@ ], "support": { "issues": "https://github.com/commerceguys/addressing/issues", - "source": "https://github.com/commerceguys/addressing/tree/v2.2.2" + "source": "https://github.com/commerceguys/addressing/tree/v2.2.3" }, - "time": "2024-07-12T11:53:22+00:00" + "time": "2024-11-11T16:07:47+00:00" }, { "name": "composer/installers", @@ -3930,16 +3930,16 @@ }, { "name": "drupal/core", - "version": "10.3.6", + "version": "10.3.8", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "168ec99f2012aeb4e93c6c7dd4a90dc919ae96c6" + "reference": "4006024a8dd7c9976fad0a2af7c9034d120c8e44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/168ec99f2012aeb4e93c6c7dd4a90dc919ae96c6", - "reference": "168ec99f2012aeb4e93c6c7dd4a90dc919ae96c6", + "url": "https://api.github.com/repos/drupal/core/zipball/4006024a8dd7c9976fad0a2af7c9034d120c8e44", + "reference": "4006024a8dd7c9976fad0a2af7c9034d120c8e44", "shasum": "" }, "require": { @@ -3985,7 +3985,7 @@ "symfony/serializer": "^6.4", "symfony/validator": "^6.4", "symfony/yaml": "^6.4", - "twig/twig": "^3.14.0" + "twig/twig": "^3.14.2" }, "conflict": { "drush/drush": "<12.4.3" @@ -4088,13 +4088,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.3.6" + "source": "https://github.com/drupal/core/tree/10.3.8" }, - "time": "2024-10-03T08:58:13+00:00" + "time": "2024-11-12T09:52:10+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.3.6", + "version": "10.3.8", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -4138,22 +4138,22 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.6" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.8" }, "time": "2024-08-22T14:31:34+00:00" }, { "name": "drupal/core-recommended", - "version": "10.3.6", + "version": "10.3.8", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "5ddec63138dc10869dea5d1cd4e72c977bb9b538" + "reference": "d43bb57a01bfdd624c423ec4ba3e1c45b90be1fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/5ddec63138dc10869dea5d1cd4e72c977bb9b538", - "reference": "5ddec63138dc10869dea5d1cd4e72c977bb9b538", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/d43bb57a01bfdd624c423ec4ba3e1c45b90be1fa", + "reference": "d43bb57a01bfdd624c423ec4ba3e1c45b90be1fa", "shasum": "" }, "require": { @@ -4162,7 +4162,7 @@ "doctrine/annotations": "~1.14.3", "doctrine/deprecations": "~1.1.3", "doctrine/lexer": "~2.1.1", - "drupal/core": "10.3.6", + "drupal/core": "10.3.8", "egulias/email-validator": "~4.0.2", "guzzlehttp/guzzle": "~7.8.1", "guzzlehttp/promises": "~2.0.2", @@ -4211,7 +4211,7 @@ "symfony/var-dumper": "~v6.4.7", "symfony/var-exporter": "~v6.4.7", "symfony/yaml": "~v6.4.7", - "twig/twig": "~v3.14.0" + "twig/twig": "~v3.14.2" }, "conflict": { "webflo/drupal-core-strict": "*" @@ -4223,9 +4223,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.3.6" + "source": "https://github.com/drupal/core-recommended/tree/10.3.8" }, - "time": "2024-10-03T08:58:13+00:00" + "time": "2024-11-12T09:52:10+00:00" }, { "name": "drupal/crop", @@ -5305,17 +5305,17 @@ }, { "name": "drupal/editoria11y", - "version": "2.1.19", + "version": "2.1.21", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editoria11y.git", - "reference": "2.1.19" + "reference": "2.1.21" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.19.zip", - "reference": "2.1.19", - "shasum": "0ccf651071837e1ee6fcfb8fbb1c279d2fc1bc27" + "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.21.zip", + "reference": "2.1.21", + "shasum": "6ec1bb5cfa15408e3372d7e0d0a1355030a9f20b" }, "require": { "drupal/core": "^9 || ^10 || ^11" @@ -5326,8 +5326,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.19", - "datestamp": "1726514804", + "version": "2.1.21", + "datestamp": "1731602531", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6401,17 +6401,17 @@ }, { "name": "drupal/focal_point", - "version": "2.1.1", + "version": "2.1.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/focal_point.git", - "reference": "2.1.1" + "reference": "2.1.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/focal_point-2.1.1.zip", - "reference": "2.1.1", - "shasum": "f8c24bb4257f784176e79ec6f2b4c11ed46391e0" + "url": "https://ftp.drupal.org/files/projects/focal_point-2.1.2.zip", + "reference": "2.1.2", + "shasum": "5f8ffadd37748506c8f00314b1d45c947eb27cf7" }, "require": { "drupal/core": "^9.3 || ^10 || ^11", @@ -6423,8 +6423,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.1", - "datestamp": "1721126807", + "version": "2.1.2", + "datestamp": "1731556344", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -8204,26 +8204,32 @@ }, { "name": "drupal/media_entity_download", - "version": "2.3.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/media_entity_download.git", - "reference": "8.x-2.3" + "reference": "8.x-2.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/media_entity_download-8.x-2.3.zip", - "reference": "8.x-2.3", - "shasum": "c63cbdcce4be1ac54c0e516e0fdc4dffee1d8304" + "url": "https://ftp.drupal.org/files/projects/media_entity_download-8.x-2.4.zip", + "reference": "8.x-2.4", + "shasum": "0851da63a679cc1b0106088b8809857650bc484c" }, "require": { "drupal/core": "^9 || ^10 || ^11" }, + "conflict": { + "drupal/linkit": "<6.0.1" + }, + "require-dev": { + "drupal/linkit": "^6 || ^7" + }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.3", - "datestamp": "1717171044", + "version": "8.x-2.4", + "datestamp": "1731513891", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -9333,7 +9339,7 @@ ], "authors": [ { - "name": "Berdir", + "name": "berdir", "homepage": "https://www.drupal.org/user/214652" }, { @@ -9353,7 +9359,7 @@ "homepage": "https://www.drupal.org/user/227761" }, { - "name": "Primsi", + "name": "primsi", "homepage": "https://www.drupal.org/user/282629" } ], @@ -9365,27 +9371,27 @@ }, { "name": "drupal/paragraphs_browser", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/paragraphs_browser.git", - "reference": "8.x-1.2" + "reference": "8.x-1.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/paragraphs_browser-8.x-1.2.zip", - "reference": "8.x-1.2", - "shasum": "d91532ead6b8be351264543707cb62541188f118" + "url": "https://ftp.drupal.org/files/projects/paragraphs_browser-8.x-1.3.zip", + "reference": "8.x-1.3", + "shasum": "2b154d47f72d2ab3e07e3857fcd4b3501b218f7e" }, "require": { - "drupal/core": "^9.3 || ^10", + "drupal/core": "^9.3 | ^10 | ^11", "drupal/paragraphs": "*" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.2", - "datestamp": "1715341106", + "version": "8.x-1.3", + "datestamp": "1731442115", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -9397,6 +9403,10 @@ "GPL-2.0-or-later" ], "authors": [ + { + "name": "bvoynick", + "homepage": "https://www.drupal.org/user/3308129" + }, { "name": "Deciphered", "homepage": "https://www.drupal.org/user/103796" @@ -9414,7 +9424,7 @@ "homepage": "https://www.drupal.org/user/636494" }, { - "name": "Mojiferous", + "name": "mojiferous", "homepage": "https://www.drupal.org/user/1678298" }, { @@ -9425,7 +9435,8 @@ "description": "Provides browser for adding additional paragraphs.", "homepage": "https://www.drupal.org/project/paragraphs_browser", "support": { - "source": "https://git.drupalcode.org/project/paragraphs_browser" + "source": "https://git.drupalcode.org/project/paragraphs_browser", + "issues": "https://www.drupal.org/project/issues/paragraphs_browser" } }, { @@ -10951,17 +10962,17 @@ }, { "name": "drupal/smart_date", - "version": "4.1.6", + "version": "4.2.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/smart_date.git", - "reference": "4.1.6" + "reference": "4.2.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/smart_date-4.1.6.zip", - "reference": "4.1.6", - "shasum": "930c2dadc2ff9f798bb165125c7f18f63869ad6e" + "url": "https://ftp.drupal.org/files/projects/smart_date-4.2.1.zip", + "reference": "4.2.1", + "shasum": "fec1d70ec64626a47e67c25f05daa3ba6a8b8a0b" }, "require": { "drupal/core": "^9 || ^10 || ^11", @@ -10977,8 +10988,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.1.6", - "datestamp": "1725628698", + "version": "4.2.1", + "datestamp": "1731590994", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -12034,17 +12045,17 @@ }, { "name": "drupal/views_bulk_operations", - "version": "4.3.0", + "version": "4.3.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_bulk_operations.git", - "reference": "4.3.0" + "reference": "4.3.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.3.0.zip", - "reference": "4.3.0", - "shasum": "887e784e3e41b05d6f8915c223d42f4273ada604" + "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.3.2.zip", + "reference": "4.3.2", + "shasum": "b3d0ee06abb15520595b83324e93c5500d5dcef3" }, "require": { "drupal/core": "^10.3 || ^11" @@ -12061,8 +12072,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.3.0", - "datestamp": "1729513620", + "version": "4.3.2", + "datestamp": "1731070018", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -13999,16 +14010,16 @@ }, { "name": "league/container", - "version": "4.2.3", + "version": "4.2.4", "source": { "type": "git", "url": "https://github.com/thephpleague/container.git", - "reference": "72f9bebe7bd623007782a40f5ec305661ab706d8" + "reference": "7ea728b013b9a156c409c6f0fc3624071b742dec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/container/zipball/72f9bebe7bd623007782a40f5ec305661ab706d8", - "reference": "72f9bebe7bd623007782a40f5ec305661ab706d8", + "url": "https://api.github.com/repos/thephpleague/container/zipball/7ea728b013b9a156c409c6f0fc3624071b742dec", + "reference": "7ea728b013b9a156c409c6f0fc3624071b742dec", "shasum": "" }, "require": { @@ -14069,7 +14080,7 @@ ], "support": { "issues": "https://github.com/thephpleague/container/issues", - "source": "https://github.com/thephpleague/container/tree/4.2.3" + "source": "https://github.com/thephpleague/container/tree/4.2.4" }, "funding": [ { @@ -14077,7 +14088,7 @@ "type": "github" } ], - "time": "2024-10-23T12:06:58+00:00" + "time": "2024-11-10T12:42:13+00:00" }, { "name": "league/csv", @@ -15975,16 +15986,16 @@ }, { "name": "su-sws/stanford_media", - "version": "11.1.1", + "version": "11.1.2", "source": { "type": "git", "url": "https://github.com/SU-SWS/stanford_media.git", - "reference": "b5defd8c3f740b5a91154e27750cc61594fd667a" + "reference": "c52f9e03bfa31dbebf1478f03603a5eb73702053" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SU-SWS/stanford_media/zipball/b5defd8c3f740b5a91154e27750cc61594fd667a", - "reference": "b5defd8c3f740b5a91154e27750cc61594fd667a", + "url": "https://api.github.com/repos/SU-SWS/stanford_media/zipball/c52f9e03bfa31dbebf1478f03603a5eb73702053", + "reference": "c52f9e03bfa31dbebf1478f03603a5eb73702053", "shasum": "" }, "require": { @@ -16031,9 +16042,9 @@ "homepage": "https://github.com/SU-SWS/stanford_media", "support": { "issues": "https://github.com/SU-SWS/stanford_media/issues", - "source": "https://github.com/SU-SWS/stanford_media/tree/11.1.1" + "source": "https://github.com/SU-SWS/stanford_media/tree/11.1.2" }, - "time": "2024-08-28T15:20:00+00:00" + "time": "2024-10-29T16:48:32+00:00" }, { "name": "su-sws/stanford_migrate", @@ -16201,16 +16212,16 @@ }, { "name": "symfony/console", - "version": "v6.4.14", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "897c2441ed4eec8a8a2c37b943427d24dba3f26b" + "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/897c2441ed4eec8a8a2c37b943427d24dba3f26b", - "reference": "897c2441ed4eec8a8a2c37b943427d24dba3f26b", + "url": "https://api.github.com/repos/symfony/console/zipball/f1fc6f47283e27336e7cebb9e8946c8de7bff9bd", + "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd", "shasum": "" }, "require": { @@ -16275,7 +16286,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.14" + "source": "https://github.com/symfony/console/tree/v6.4.15" }, "funding": [ { @@ -16291,20 +16302,20 @@ "type": "tidelift" } ], - "time": "2024-11-05T15:34:40+00:00" + "time": "2024-11-06T14:19:14+00:00" }, { "name": "symfony/dependency-injection", - "version": "v6.4.13", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "728ae8f4e190133ce99d6d5f0bc1e8c8bd7c7a96" + "reference": "70ab1f65a4516ef741e519ea938e6aa465e6aa36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/728ae8f4e190133ce99d6d5f0bc1e8c8bd7c7a96", - "reference": "728ae8f4e190133ce99d6d5f0bc1e8c8bd7c7a96", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/70ab1f65a4516ef741e519ea938e6aa465e6aa36", + "reference": "70ab1f65a4516ef741e519ea938e6aa465e6aa36", "shasum": "" }, "require": { @@ -16356,7 +16367,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.13" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.15" }, "funding": [ { @@ -16372,7 +16383,7 @@ "type": "tidelift" } ], - "time": "2024-10-25T15:07:50+00:00" + "time": "2024-11-09T06:56:25+00:00" }, { "name": "symfony/deprecation-contracts", @@ -16804,16 +16815,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.4.14", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "ba020a321a95519303a3f09ec2824d34d601c388" + "reference": "9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ba020a321a95519303a3f09ec2824d34d601c388", - "reference": "ba020a321a95519303a3f09ec2824d34d601c388", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6", + "reference": "9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6", "shasum": "" }, "require": { @@ -16823,12 +16834,12 @@ "symfony/polyfill-php83": "^1.27" }, "conflict": { - "symfony/cache": "<6.3" + "symfony/cache": "<6.4.12|>=7.0,<7.1.5" }, "require-dev": { "doctrine/dbal": "^2.13.1|^3|^4", "predis/predis": "^1.1|^2.0", - "symfony/cache": "^6.3|^7.0", + "symfony/cache": "^6.4.12|^7.1.5", "symfony/dependency-injection": "^5.4|^6.0|^7.0", "symfony/expression-language": "^5.4|^6.0|^7.0", "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0", @@ -16861,7 +16872,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.4.14" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.15" }, "funding": [ { @@ -16877,20 +16888,20 @@ "type": "tidelift" } ], - "time": "2024-11-05T16:39:55+00:00" + "time": "2024-11-08T16:09:24+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.14", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "8278a947d0369754a47b758a9e17b72cab970951" + "reference": "b002a5b3947653c5aee3adac2a024ea615fd3ff5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8278a947d0369754a47b758a9e17b72cab970951", - "reference": "8278a947d0369754a47b758a9e17b72cab970951", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b002a5b3947653c5aee3adac2a024ea615fd3ff5", + "reference": "b002a5b3947653c5aee3adac2a024ea615fd3ff5", "shasum": "" }, "require": { @@ -16975,7 +16986,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.14" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.15" }, "funding": [ { @@ -16991,7 +17002,7 @@ "type": "tidelift" } ], - "time": "2024-11-06T09:45:21+00:00" + "time": "2024-11-13T13:57:37+00:00" }, { "name": "symfony/mailer", @@ -17940,16 +17951,16 @@ }, { "name": "symfony/process", - "version": "v6.4.14", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "25214adbb0996d18112548de20c281be9f27279f" + "reference": "3cb242f059c14ae08591c5c4087d1fe443564392" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/25214adbb0996d18112548de20c281be9f27279f", - "reference": "25214adbb0996d18112548de20c281be9f27279f", + "url": "https://api.github.com/repos/symfony/process/zipball/3cb242f059c14ae08591c5c4087d1fe443564392", + "reference": "3cb242f059c14ae08591c5c4087d1fe443564392", "shasum": "" }, "require": { @@ -17981,7 +17992,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.14" + "source": "https://github.com/symfony/process/tree/v6.4.15" }, "funding": [ { @@ -17997,7 +18008,7 @@ "type": "tidelift" } ], - "time": "2024-11-06T09:25:01+00:00" + "time": "2024-11-06T14:19:14+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -18167,16 +18178,16 @@ }, { "name": "symfony/serializer", - "version": "v6.4.13", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "8be421505938b11a0ca4f656e4322232236386f0" + "reference": "9d862d66198f3c2e30404228629ef4c18d5d608e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/8be421505938b11a0ca4f656e4322232236386f0", - "reference": "8be421505938b11a0ca4f656e4322232236386f0", + "url": "https://api.github.com/repos/symfony/serializer/zipball/9d862d66198f3c2e30404228629ef4c18d5d608e", + "reference": "9d862d66198f3c2e30404228629ef4c18d5d608e", "shasum": "" }, "require": { @@ -18245,7 +18256,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.13" + "source": "https://github.com/symfony/serializer/tree/v6.4.15" }, "funding": [ { @@ -18261,7 +18272,7 @@ "type": "tidelift" } ], - "time": "2024-10-03T09:58:04+00:00" + "time": "2024-10-23T13:25:59+00:00" }, { "name": "symfony/service-contracts", @@ -18348,16 +18359,16 @@ }, { "name": "symfony/string", - "version": "v6.4.13", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627" + "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", - "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", + "url": "https://api.github.com/repos/symfony/string/zipball/73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", + "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", "shasum": "" }, "require": { @@ -18414,7 +18425,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.13" + "source": "https://github.com/symfony/string/tree/v6.4.15" }, "funding": [ { @@ -18430,7 +18441,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:18:03+00:00" + "time": "2024-11-13T13:31:12+00:00" }, { "name": "symfony/translation-contracts", @@ -18621,16 +18632,16 @@ }, { "name": "symfony/validator", - "version": "v6.4.14", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "dc259b85e59a6569e205966d447dec0a7d95facf" + "reference": "7541055cdaf54ff95f0735bf703d313374e8b20b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/dc259b85e59a6569e205966d447dec0a7d95facf", - "reference": "dc259b85e59a6569e205966d447dec0a7d95facf", + "url": "https://api.github.com/repos/symfony/validator/zipball/7541055cdaf54ff95f0735bf703d313374e8b20b", + "reference": "7541055cdaf54ff95f0735bf703d313374e8b20b", "shasum": "" }, "require": { @@ -18698,7 +18709,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.4.14" + "source": "https://github.com/symfony/validator/tree/v6.4.15" }, "funding": [ { @@ -18714,20 +18725,20 @@ "type": "tidelift" } ], - "time": "2024-11-04T11:33:53+00:00" + "time": "2024-11-08T15:28:48+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.14", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "93c09246038178717a9c14b809ea8151ffcf7091" + "reference": "38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/93c09246038178717a9c14b809ea8151ffcf7091", - "reference": "93c09246038178717a9c14b809ea8151ffcf7091", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80", + "reference": "38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80", "shasum": "" }, "require": { @@ -18783,7 +18794,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.14" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.15" }, "funding": [ { @@ -18799,7 +18810,7 @@ "type": "tidelift" } ], - "time": "2024-11-05T15:34:40+00:00" + "time": "2024-11-08T15:28:48+00:00" }, { "name": "symfony/var-exporter", @@ -20253,16 +20264,16 @@ }, { "name": "composer/pcre", - "version": "3.3.1", + "version": "3.3.2", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4" + "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4", - "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4", + "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e", + "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e", "shasum": "" }, "require": { @@ -20272,8 +20283,8 @@ "phpstan/phpstan": "<1.11.10" }, "require-dev": { - "phpstan/phpstan": "^1.11.10", - "phpstan/phpstan-strict-rules": "^1.1", + "phpstan/phpstan": "^1.12 || ^2", + "phpstan/phpstan-strict-rules": "^1 || ^2", "phpunit/phpunit": "^8 || ^9" }, "type": "library", @@ -20312,7 +20323,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.3.1" + "source": "https://github.com/composer/pcre/tree/3.3.2" }, "funding": [ { @@ -20328,7 +20339,7 @@ "type": "tidelift" } ], - "time": "2024-08-27T18:44:43+00:00" + "time": "2024-11-12T16:29:46+00:00" }, { "name": "composer/spdx-licenses", @@ -20986,7 +20997,7 @@ }, { "name": "drupal/core-dev", - "version": "10.3.7", + "version": "10.3.8", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", @@ -21036,7 +21047,7 @@ ], "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.3.7" + "source": "https://github.com/drupal/core-dev/tree/10.3.8" }, "time": "2024-07-04T10:19:29+00:00" }, @@ -21211,16 +21222,16 @@ }, { "name": "fakerphp/faker", - "version": "v1.23.1", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b" + "reference": "a136842a532bac9ecd8a1c723852b09915d7db50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/bfb4fe148adbf78eff521199619b93a52ae3554b", - "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/a136842a532bac9ecd8a1c723852b09915d7db50", + "reference": "a136842a532bac9ecd8a1c723852b09915d7db50", "shasum": "" }, "require": { @@ -21268,9 +21279,9 @@ ], "support": { "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.23.1" + "source": "https://github.com/FakerPHP/Faker/tree/v1.24.0" }, - "time": "2024-01-02T13:46:09+00:00" + "time": "2024-11-07T15:11:20+00:00" }, { "name": "google/protobuf", @@ -21805,16 +21816,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.12.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845", + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845", "shasum": "" }, "require": { @@ -21853,7 +21864,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1" }, "funding": [ { @@ -21861,7 +21872,7 @@ "type": "tidelift" } ], - "time": "2024-06-12T14:39:25+00:00" + "time": "2024-11-08T17:47:46+00:00" }, { "name": "nyholm/psr7-server", @@ -22821,16 +22832,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.5.1", + "version": "5.6.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "0c70d2c566e899666f367ab7b80986beb3581e6f" + "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/0c70d2c566e899666f367ab7b80986beb3581e6f", - "reference": "0c70d2c566e899666f367ab7b80986beb3581e6f", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/f3558a4c23426d12bffeaab463f8a8d8b681193c", + "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c", "shasum": "" }, "require": { @@ -22839,7 +22850,7 @@ "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", "phpdocumentor/type-resolver": "^1.7", - "phpstan/phpdoc-parser": "^1.7", + "phpstan/phpdoc-parser": "^1.7|^2.0", "webmozart/assert": "^1.9.1" }, "require-dev": { @@ -22879,29 +22890,29 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.5.1" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.0" }, - "time": "2024-11-06T11:58:54+00:00" + "time": "2024-11-12T11:25:25+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.9.0", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d" + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/1fb5ba8d045f5dd984ebded5b1cc66f29459422d", - "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a", + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.18" + "phpstan/phpdoc-parser": "^1.18|^2.0" }, "require-dev": { "ext-tokenizer": "*", @@ -22937,9 +22948,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.9.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0" }, - "time": "2024-11-03T20:11:34+00:00" + "time": "2024-11-09T15:12:26+00:00" }, { "name": "phpspec/prophecy", @@ -23112,30 +23123,30 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.33.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140" + "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/82a311fd3690fb2bf7b64d5c98f912b3dd746140", - "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/c00d78fb6b29658347f9d37ebe104bffadf36299", + "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "doctrine/annotations": "^2.0", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^5.3.0", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.5", - "phpstan/phpstan-phpunit": "^1.1", - "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^9.5", + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpstan/phpstan-strict-rules": "^2.0", + "phpunit/phpunit": "^9.6", "symfony/process": "^5.2" }, "type": "library", @@ -23153,22 +23164,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.33.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.0.0" }, - "time": "2024-10-13T11:25:22+00:00" + "time": "2024-10-13T11:29:49+00:00" }, { "name": "phpstan/phpstan", - "version": "1.12.8", + "version": "1.12.10", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c" + "reference": "fc463b5d0fe906dcf19689be692c65c50406a071" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6a60a4d66142b8156c9da923f1972657bc4748c", - "reference": "f6a60a4d66142b8156c9da923f1972657bc4748c", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/fc463b5d0fe906dcf19689be692c65c50406a071", + "reference": "fc463b5d0fe906dcf19689be692c65c50406a071", "shasum": "" }, "require": { @@ -23213,7 +23224,7 @@ "type": "github" } ], - "time": "2024-11-06T19:06:49+00:00" + "time": "2024-11-11T15:37:09+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -23264,21 +23275,21 @@ }, { "name": "phpstan/phpstan-phpunit", - "version": "1.4.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-phpunit.git", - "reference": "f3ea021866f4263f07ca3636bf22c64be9610c11" + "reference": "11d4235fbc6313ecbf93708606edfd3222e44949" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/f3ea021866f4263f07ca3636bf22c64be9610c11", - "reference": "f3ea021866f4263f07ca3636bf22c64be9610c11", + "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/11d4235fbc6313ecbf93708606edfd3222e44949", + "reference": "11d4235fbc6313ecbf93708606edfd3222e44949", "shasum": "" }, "require": { "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.11" + "phpstan/phpstan": "^1.12" }, "conflict": { "phpunit/phpunit": "<7.0" @@ -23310,9 +23321,9 @@ "description": "PHPUnit extensions and rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-phpunit/issues", - "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.4.0" + "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.4.1" }, - "time": "2024-04-20T06:39:00+00:00" + "time": "2024-11-12T12:43:59+00:00" }, { "name": "phpunit/php-code-coverage", @@ -26134,14 +26145,14 @@ "drupal/views_ical": 15, "drupal/webform": 10, "onlyextart/colorbox": 20, - "su-sws/blt-sws": 20, - "su-sws/stanford_basic": 20 + "su-sws/stanford_basic": 20, + "su-sws/blt-sws": 20 }, "prefer-stable": true, "prefer-lowest": false, "platform": { "php": ">=8.3" }, - "platform-dev": {}, + "platform-dev": [], "plugin-api-version": "2.6.0" } diff --git a/docroot/sites/default/default.settings.php b/docroot/sites/default/default.settings.php index 264597b16..90883ff46 100644 --- a/docroot/sites/default/default.settings.php +++ b/docroot/sites/default/default.settings.php @@ -730,6 +730,8 @@ * Provide a fully qualified class name here if you would like to provide an * alternate implementation YAML parser. The class must implement the * \Drupal\Component\Serialization\SerializationInterface interface. + * + * This setting is deprecated in Drupal 10.3 and removed in Drupal 11. */ # $settings['yaml_parser_class'] = NULL; From c787c02ad75334eeff752108ece541296ef3afd0 Mon Sep 17 00:00:00 2001 From: joegl <20383-joegl@users.noreply.drupalcode.org> Date: Wed, 20 Nov 2024 09:35:38 -0600 Subject: [PATCH 3/5] Add twig performance degradation patch. --- composer.json | 3 +- patches/core/core-mr-10177.patch | 169 +++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 1 deletion(-) create mode 100644 patches/core/core-mr-10177.patch diff --git a/composer.json b/composer.json index 93ccea05e..576be2ab9 100644 --- a/composer.json +++ b/composer.json @@ -247,7 +247,8 @@ "Allow hs group blocks in layout_builder": "patches/layout_builder-allow-hs-blocks.patch", "Allow media items to be edited in a modal when using the field widget https://www.drupal.org/project/drupal/issues/2985168": "https://www.drupal.org/files/issues/2023-12-18/2985168-172.patch", "Cannot read properties of undefined (reading 'settings') with dialog.position.js https://www.drupal.org/project/drupal/issues/3356667": "patches/core/core-mr-8892.patch", - "https://www.drupal.org/project/drupal/issues/3207813: ModuleHandler skips all hook implementations when invoked before the module files have been loaded": "patches/core/core-mr-6976.patch" + "https://www.drupal.org/project/drupal/issues/3207813: ModuleHandler skips all hook implementations when invoked before the module files have been loaded": "patches/core/core-mr-6976.patch", + "https://www.drupal.org/project/drupal/issues/3487031: Twig 13.4.2 performance degradation": "patches/core/core-mr-10177.patch" }, "drupal/entity_reference_exposed_filters": { "https://www.drupal.org/project/entity_reference_exposed_filters/issues/3189025": "https://www.drupal.org/files/issues/2023-10-17/entity_reference_exposed_filters-empty_target-3189025-4.patch" diff --git a/patches/core/core-mr-10177.patch b/patches/core/core-mr-10177.patch new file mode 100644 index 000000000..09b74f544 --- /dev/null +++ b/patches/core/core-mr-10177.patch @@ -0,0 +1,169 @@ +diff --git a/core/lib/Drupal/Core/Template/RemoveCheckToStringNodeVisitor.php b/core/lib/Drupal/Core/Template/RemoveCheckToStringNodeVisitor.php +new file mode 100644 +index 0000000000000000000000000000000000000000..568b22ace9d48ff91c2d50a70cccd419c358382a +--- /dev/null ++++ b/core/lib/Drupal/Core/Template/RemoveCheckToStringNodeVisitor.php +@@ -0,0 +1,56 @@ ++getNode('expr')); ++ // @todo https://www.drupal.org/project/drupal/issues/3488584 Update for ++ // Twig 4 as the spread attribute has been removed there. ++ if ($node->hasAttribute('spread')) { ++ $new->setAttribute('spread', $node->getAttribute('spread')); ++ } ++ return $new; ++ } ++ return $node; ++ } ++ ++ /** ++ * {@inheritdoc} ++ */ ++ public function leaveNode(Node $node, Environment $env): ?Node { ++ return $node; ++ } ++ ++ /** ++ * {@inheritdoc} ++ */ ++ public function getPriority() { ++ // Runs after sandbox visitor. ++ return 1; ++ } ++ ++} +diff --git a/core/lib/Drupal/Core/Template/TwigExtension.php b/core/lib/Drupal/Core/Template/TwigExtension.php +index cd34aec44973bc8b2a2baf1044c8f2982cdf1ae5..b5a6a5c2ee097667117a554f45694ad9014756c2 100644 +--- a/core/lib/Drupal/Core/Template/TwigExtension.php ++++ b/core/lib/Drupal/Core/Template/TwigExtension.php +@@ -158,10 +158,18 @@ public function getFilters() { + public function getNodeVisitors() { + // The node visitor is needed to wrap all variables with + // render_var -> TwigExtension->renderVar() function. +- return [ ++ $visitors = [ + new TwigNodeVisitor(), + new TwigNodeVisitorCheckDeprecations(), + ]; ++ if (\in_array('__toString', TwigSandboxPolicy::getMethodsAllowedOnAllObjects(), TRUE)) { ++ // When __toString is an allowed method, there is no point in running ++ // \Twig\Extension\SandboxExtension::ensureToStringAllowed, so we add a ++ // node visitor to remove any CheckToStringNode nodes added by the ++ // sandbox extension. ++ $visitors[] = new RemoveCheckToStringNodeVisitor(); ++ } ++ return $visitors; + } + + /** +diff --git a/core/lib/Drupal/Core/Template/TwigSandboxPolicy.php b/core/lib/Drupal/Core/Template/TwigSandboxPolicy.php +index 2a8dfe7dae64a62cd228290ab722b21ed28f1cfb..67d04d5d7f2c5afb59cfefd86eef473b48706033 100644 +--- a/core/lib/Drupal/Core/Template/TwigSandboxPolicy.php ++++ b/core/lib/Drupal/Core/Template/TwigSandboxPolicy.php +@@ -57,15 +57,7 @@ public function __construct() { + // Flip the array so we can check using isset(). + $this->allowed_classes = array_flip($allowed_classes); + +- $allowed_methods = Settings::get('twig_sandbox_allowed_methods', [ +- // Only allow idempotent methods. +- 'id', +- 'label', +- 'bundle', +- 'get', +- '__toString', +- 'toString', +- ]); ++ $allowed_methods = static::getMethodsAllowedOnAllObjects(); + // Flip the array so we can check using isset(). + $this->allowed_methods = array_flip($allowed_methods); + +@@ -112,4 +104,22 @@ public function checkMethodAllowed($obj, $method): void { + throw new SecurityError(sprintf('Calling "%s" method on a "%s" object is not allowed.', $method, get_class($obj))); + } + ++ /** ++ * Gets the list of allowed methods on all objects. ++ * ++ * @return string[] ++ * The list of allowed methods on all objects. ++ */ ++ public static function getMethodsAllowedOnAllObjects(): array { ++ return Settings::get('twig_sandbox_allowed_methods', [ ++ // Only allow idempotent methods. ++ 'id', ++ 'label', ++ 'bundle', ++ 'get', ++ '__toString', ++ 'toString', ++ ]); ++ } ++ + } +diff --git a/core/lib/Drupal/Core/Template/TwigSimpleCheckToStringNode.php b/core/lib/Drupal/Core/Template/TwigSimpleCheckToStringNode.php +new file mode 100644 +index 0000000000000000000000000000000000000000..42f32a5d469415e661589a66167fdc6bf36a5941 +--- /dev/null ++++ b/core/lib/Drupal/Core/Template/TwigSimpleCheckToStringNode.php +@@ -0,0 +1,33 @@ ++getNode('expr'); ++ $compiler ++ ->subcompile($expr); ++ } ++ ++} From 7e526e5863ef55bdec7adbecc323877ae7ba2ba2 Mon Sep 17 00:00:00 2001 From: joegl <20383-joegl@users.noreply.drupalcode.org> Date: Wed, 20 Nov 2024 10:04:46 -0600 Subject: [PATCH 4/5] Updated profile version. --- .../humsci/su_humsci_profile/su_humsci_profile.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml index a64334951..0361938e4 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml @@ -1,7 +1,7 @@ name: 'Stanford HumSci' type: profile description: 'Installation profile for HumSci Drupal' -version: 11.5.2 +version: 11.6.0 core_version_requirement: ^10.3 || ^11 themes: - material_admin From 840e36acd2c96736a96ff473f9d2c0fa318cc38f Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 20 Nov 2024 16:13:51 +0000 Subject: [PATCH 5/5] 11.6.1 --- .../humsci/su_humsci_profile/su_humsci_profile.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml index 0361938e4..b684af75e 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml @@ -1,7 +1,7 @@ name: 'Stanford HumSci' type: profile description: 'Installation profile for HumSci Drupal' -version: 11.6.0 +version: 11.6.1 core_version_requirement: ^10.3 || ^11 themes: - material_admin