From fa6178974cd064b685eee4ca14f2a3c9e1dc103d Mon Sep 17 00:00:00 2001 From: Peter Lieverdink Date: Fri, 16 Feb 2024 03:20:42 +0000 Subject: [PATCH 1/4] fix: Allow composer to run as root. --- docker/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 09a3fa34..7ffd4229 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,10 +9,9 @@ WORKDIR /srv/www # Clean up previous composer installation and run new one. RUN rm -rf ./vendor && \ - # Update composer to avoid issues with missing drupal files. - # @see https://github.com/drupal-composer/drupal-project/issues/282 - composer self-update && \ - COMPOSER_MEMORY_LIMIT=-1 composer install --no-dev --no-interaction --prefer-dist + COMPOSER_ALLOW_SUPERUSER=1 \ + COMPOSER_MEMORY_LIMIT=-1 \ + composer install --no-dev --no-interaction --prefer-dist # Copy settings to default site location. RUN mkdir -m 0775 -p html/sites/default && \ From 6699182755d6672d0b1aca80e0dd2514d87bfced Mon Sep 17 00:00:00 2001 From: berliner Date: Thu, 22 Feb 2024 10:42:37 +0100 Subject: [PATCH 2/4] Updates --- composer.lock | 336 +++++++++--------- composer.patches.json | 2 +- ...2544110.patch => 2544110-2024-02-15.patch} | 37 +- 3 files changed, 185 insertions(+), 190 deletions(-) rename patches/{2544110.patch => 2544110-2024-02-15.patch} (90%) diff --git a/composer.lock b/composer.lock index 72684902..be705058 100644 --- a/composer.lock +++ b/composer.lock @@ -617,16 +617,16 @@ }, { "name": "composer/composer", - "version": "2.6.6", + "version": "2.7.1", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "683557bd2466072777309d039534bb1332d0dda5" + "reference": "aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/683557bd2466072777309d039534bb1332d0dda5", - "reference": "683557bd2466072777309d039534bb1332d0dda5", + "url": "https://api.github.com/repos/composer/composer/zipball/aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc", + "reference": "aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc", "shasum": "" }, "require": { @@ -644,7 +644,7 @@ "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.2", "seld/signal-handler": "^2.0", - "symfony/console": "^5.4.11 || ^6.0.11", + "symfony/console": "^5.4.11 || ^6.0.11 || ^7", "symfony/filesystem": "^5.4 || ^6.0 || ^7", "symfony/finder": "^5.4 || ^6.0 || ^7", "symfony/polyfill-php73": "^1.24", @@ -658,7 +658,7 @@ "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1", "phpstan/phpstan-symfony": "^1.2.10", - "symfony/phpunit-bridge": "^6.0 || ^7" + "symfony/phpunit-bridge": "^6.4.1 || ^7.0.1" }, "suggest": { "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -671,7 +671,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.6-dev" + "dev-main": "2.7-dev" }, "phpstan": { "includes": [ @@ -711,7 +711,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.6.6" + "source": "https://github.com/composer/composer/tree/2.7.1" }, "funding": [ { @@ -727,7 +727,7 @@ "type": "tidelift" } ], - "time": "2023-12-08T17:32:26+00:00" + "time": "2024-02-09T14:26:28+00:00" }, { "name": "composer/installers", @@ -2188,16 +2188,16 @@ }, { "name": "doctrine/lexer", - "version": "2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124" + "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", - "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6", + "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6", "shasum": "" }, "require": { @@ -2205,11 +2205,11 @@ "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^10", + "doctrine/coding-standard": "^9 || ^12", "phpstan/phpstan": "^1.3", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6", "psalm/plugin-phpunit": "^0.18.3", - "vimeo/psalm": "^4.11 || ^5.0" + "vimeo/psalm": "^4.11 || ^5.21" }, "type": "library", "autoload": { @@ -2246,7 +2246,7 @@ ], "support": { "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/2.1.0" + "source": "https://github.com/doctrine/lexer/tree/2.1.1" }, "funding": [ { @@ -2262,7 +2262,7 @@ "type": "tidelift" } ], - "time": "2022-12-14T08:49:07+00:00" + "time": "2024-02-05T11:35:39+00:00" }, { "name": "drupal/admin_denied", @@ -2310,17 +2310,17 @@ }, { "name": "drupal/admin_dialogs", - "version": "1.0.19", + "version": "1.0.20", "source": { "type": "git", "url": "https://git.drupalcode.org/project/admin_dialogs.git", - "reference": "1.0.19" + "reference": "1.0.20" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/admin_dialogs-1.0.19.zip", - "reference": "1.0.19", - "shasum": "77602aec6907dac1d5c4da71690b61ba7ed308a2" + "url": "https://ftp.drupal.org/files/projects/admin_dialogs-1.0.20.zip", + "reference": "1.0.20", + "shasum": "8a0158c8c37fd8a130b9191920934cafacc33017" }, "require": { "drupal/core": "^9 || ^10" @@ -2328,8 +2328,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "1.0.19", - "datestamp": "1706273608", + "version": "1.0.20", + "datestamp": "1708377988", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2947,16 +2947,16 @@ }, { "name": "drupal/core", - "version": "10.2.2", + "version": "10.2.3", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "fc9abad1ab687635a5eddec00aa1a5f2a29a23bd" + "reference": "cc8c7952f7013795b735f5c15290e76937163bb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/fc9abad1ab687635a5eddec00aa1a5f2a29a23bd", - "reference": "fc9abad1ab687635a5eddec00aa1a5f2a29a23bd", + "url": "https://api.github.com/repos/drupal/core/zipball/cc8c7952f7013795b735f5c15290e76937163bb7", + "reference": "cc8c7952f7013795b735f5c15290e76937163bb7", "shasum": "" }, "require": { @@ -3104,22 +3104,22 @@ ], "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.2" + "source": "https://github.com/drupal/core/tree/10.2.3" }, - "time": "2024-01-16T21:10:58+00:00" + "time": "2024-02-07T22:44:48+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.2.2", + "version": "10.2.3", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", - "reference": "97bd91856535a354e9b1b815f0957893e26b6622" + "reference": "63effa1bc644e80a269e8b4415e627491d26fd3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/97bd91856535a354e9b1b815f0957893e26b6622", - "reference": "97bd91856535a354e9b1b815f0957893e26b6622", + "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/63effa1bc644e80a269e8b4415e627491d26fd3f", + "reference": "63effa1bc644e80a269e8b4415e627491d26fd3f", "shasum": "" }, "require": { @@ -3154,13 +3154,13 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.2.2" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.2.3" }, - "time": "2023-11-15T23:23:28+00:00" + "time": "2024-01-26T14:59:30+00:00" }, { "name": "drupal/core-dev", - "version": "10.2.2", + "version": "10.2.3", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", @@ -3210,13 +3210,13 @@ ], "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.2" + "source": "https://github.com/drupal/core-dev/tree/10.2.3" }, "time": "2023-12-12T22:01:45+00:00" }, { "name": "drupal/core-project-message", - "version": "10.2.2", + "version": "10.2.3", "source": { "type": "git", "url": "https://github.com/drupal/core-project-message.git", @@ -3251,22 +3251,22 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-project-message/tree/10.2.2" + "source": "https://github.com/drupal/core-project-message/tree/10.2.3" }, "time": "2023-07-24T07:55:25+00:00" }, { "name": "drupal/core-recommended", - "version": "10.2.2", + "version": "10.2.3", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "d8cb769d86449af5ad763f3517c7f3c0e226ed60" + "reference": "ee5d148455ca5792108a1fd007ae162ea2ffe859" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/d8cb769d86449af5ad763f3517c7f3c0e226ed60", - "reference": "d8cb769d86449af5ad763f3517c7f3c0e226ed60", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/ee5d148455ca5792108a1fd007ae162ea2ffe859", + "reference": "ee5d148455ca5792108a1fd007ae162ea2ffe859", "shasum": "" }, "require": { @@ -3275,7 +3275,7 @@ "doctrine/annotations": "~1.14.3", "doctrine/deprecations": "~1.1.2", "doctrine/lexer": "~2.1.0", - "drupal/core": "10.2.2", + "drupal/core": "10.2.3", "egulias/email-validator": "~4.0.2", "guzzlehttp/guzzle": "~7.8.1", "guzzlehttp/promises": "~2.0.2", @@ -3336,9 +3336,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.2" + "source": "https://github.com/drupal/core-recommended/tree/10.2.3" }, - "time": "2024-01-16T21:10:58+00:00" + "time": "2024-02-07T22:44:48+00:00" }, { "name": "drupal/csp", @@ -3484,17 +3484,17 @@ }, { "name": "drupal/custom_field", - "version": "2.0.0-rc7", + "version": "2.0.0-rc6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/custom_field.git", - "reference": "2.0.0-rc7" + "reference": "2.0.0-rc6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/custom_field-2.0.0-rc7.zip", - "reference": "2.0.0-rc7", - "shasum": "8ab551fc34cdd15f392deeef4ef0e6ed6f988a29" + "url": "https://ftp.drupal.org/files/projects/custom_field-2.0.0-rc6.zip", + "reference": "2.0.0-rc6", + "shasum": "53db8135daee8c9273006de3ca208ba9de4a74f0" }, "require": { "drupal/core": "^9.4 || ^10.1" @@ -3506,8 +3506,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0-rc7", - "datestamp": "1704966954", + "version": "2.0.0-rc6", + "datestamp": "1703275144", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -6653,16 +6653,16 @@ }, { "name": "google/protobuf", - "version": "v3.25.2", + "version": "v3.25.3", "source": { "type": "git", "url": "https://github.com/protocolbuffers/protobuf-php.git", - "reference": "83ea4c147718666ce6a9b9332ac2aa588c9211eb" + "reference": "983a87f4f8798a90ca3a25b0f300b8fda38df643" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/83ea4c147718666ce6a9b9332ac2aa588c9211eb", - "reference": "83ea4c147718666ce6a9b9332ac2aa588c9211eb", + "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/983a87f4f8798a90ca3a25b0f300b8fda38df643", + "reference": "983a87f4f8798a90ca3a25b0f300b8fda38df643", "shasum": "" }, "require": { @@ -6691,9 +6691,9 @@ "proto" ], "support": { - "source": "https://github.com/protocolbuffers/protobuf-php/tree/v3.25.2" + "source": "https://github.com/protocolbuffers/protobuf-php/tree/v3.25.3" }, - "time": "2024-01-09T22:12:32+00:00" + "time": "2024-02-15T21:11:49+00:00" }, { "name": "grasmash/expander", @@ -7843,16 +7843,16 @@ }, { "name": "mglaman/phpstan-drupal", - "version": "1.2.6", + "version": "1.2.7", "source": { "type": "git", "url": "https://github.com/mglaman/phpstan-drupal.git", - "reference": "ba8678f8cbea42cc41022c21751004eb677cf5a4" + "reference": "32f79fcf48c74532014248687ae3850581a22416" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/ba8678f8cbea42cc41022c21751004eb677cf5a4", - "reference": "ba8678f8cbea42cc41022c21751004eb677cf5a4", + "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/32f79fcf48c74532014248687ae3850581a22416", + "reference": "32f79fcf48c74532014248687ae3850581a22416", "shasum": "" }, "require": { @@ -7927,7 +7927,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.6" + "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.7" }, "funding": [ { @@ -7943,7 +7943,7 @@ "type": "tidelift" } ], - "time": "2024-01-16T00:42:10+00:00" + "time": "2024-02-14T04:38:08+00:00" }, { "name": "micheh/phpcs-gitlab", @@ -8263,16 +8263,16 @@ }, { "name": "open-telemetry/api", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/api.git", - "reference": "401d04c6afe349afa78250ac862db2f89dbf94f6" + "reference": "87de95d926f46262885d0d390060c095af13e2e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/401d04c6afe349afa78250ac862db2f89dbf94f6", - "reference": "401d04c6afe349afa78250ac862db2f89dbf94f6", + "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/87de95d926f46262885d0d390060c095af13e2e5", + "reference": "87de95d926f46262885d0d390060c095af13e2e5", "shasum": "" }, "require": { @@ -8326,7 +8326,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-01-10T13:04:59+00:00" + "time": "2024-02-06T01:32:25+00:00" }, { "name": "open-telemetry/context", @@ -8518,16 +8518,16 @@ }, { "name": "open-telemetry/sdk", - "version": "1.0.7", + "version": "1.0.8", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/sdk.git", - "reference": "818263750d299df5b9612a738440e56d92e5a296" + "reference": "1da4c0ca4f1a3c0fe84b81729dadec16f464fa77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/818263750d299df5b9612a738440e56d92e5a296", - "reference": "818263750d299df5b9612a738440e56d92e5a296", + "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/1da4c0ca4f1a3c0fe84b81729dadec16f464fa77", + "reference": "1da4c0ca4f1a3c0fe84b81729dadec16f464fa77", "shasum": "" }, "require": { @@ -8597,7 +8597,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-01-24T12:00:22+00:00" + "time": "2024-02-02T03:42:40+00:00" }, { "name": "open-telemetry/sem-conv", @@ -9058,16 +9058,16 @@ }, { "name": "phenx/php-font-lib", - "version": "0.5.5", + "version": "0.5.6", "source": { "type": "git", "url": "https://github.com/dompdf/php-font-lib.git", - "reference": "671df0f3516252011aa94f9e8e3b3b66199339f8" + "reference": "a1681e9793040740a405ac5b189275059e2a9863" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/671df0f3516252011aa94f9e8e3b3b66199339f8", - "reference": "671df0f3516252011aa94f9e8e3b3b66199339f8", + "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/a1681e9793040740a405ac5b189275059e2a9863", + "reference": "a1681e9793040740a405ac5b189275059e2a9863", "shasum": "" }, "require": { @@ -9096,9 +9096,9 @@ "homepage": "https://github.com/PhenX/php-font-lib", "support": { "issues": "https://github.com/dompdf/php-font-lib/issues", - "source": "https://github.com/dompdf/php-font-lib/tree/0.5.5" + "source": "https://github.com/dompdf/php-font-lib/tree/0.5.6" }, - "time": "2024-01-07T18:13:29+00:00" + "time": "2024-01-29T14:45:26+00:00" }, { "name": "phootwork/collection", @@ -9565,16 +9565,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.8.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc" + "reference": "bc3dc91a5e9b14aa06d1d9e90647c5c5a2cc5353" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc", - "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/bc3dc91a5e9b14aa06d1d9e90647c5c5a2cc5353", + "reference": "bc3dc91a5e9b14aa06d1d9e90647c5c5a2cc5353", "shasum": "" }, "require": { @@ -9617,9 +9617,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.8.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.1" }, - "time": "2024-01-11T11:49:22+00:00" + "time": "2024-01-18T19:15:27+00:00" }, { "name": "phpoffice/phpspreadsheet", @@ -9992,16 +9992,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.57", + "version": "1.10.59", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e" + "reference": "e607609388d3a6d418a50a49f7940e8086798281" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e", - "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e607609388d3a6d418a50a49f7940e8086798281", + "reference": "e607609388d3a6d418a50a49f7940e8086798281", "shasum": "" }, "require": { @@ -10050,7 +10050,7 @@ "type": "tidelift" } ], - "time": "2024-01-24T11:51:34+00:00" + "time": "2024-02-20T13:59:13+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -12149,16 +12149,16 @@ }, { "name": "seld/jsonlint", - "version": "1.10.1", + "version": "1.10.2", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "76d449a358ece77d6f1d6331c68453e657172202" + "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/76d449a358ece77d6f1d6331c68453e657172202", - "reference": "76d449a358ece77d6f1d6331c68453e657172202", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9bb7db07b5d66d90f6ebf542f09fc67d800e5259", + "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259", "shasum": "" }, "require": { @@ -12197,7 +12197,7 @@ ], "support": { "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.10.1" + "source": "https://github.com/Seldaek/jsonlint/tree/1.10.2" }, "funding": [ { @@ -12209,7 +12209,7 @@ "type": "tidelift" } ], - "time": "2023-12-18T13:03:25+00:00" + "time": "2024-02-07T12:57:50+00:00" }, { "name": "seld/phar-utils", @@ -12441,16 +12441,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.8.1", + "version": "3.9.0", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "14f5fff1e64118595db5408e946f3a22c75807f7" + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7", - "reference": "14f5fff1e64118595db5408e946f3a22c75807f7", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", "shasum": "" }, "require": { @@ -12517,7 +12517,7 @@ "type": "open_collective" } ], - "time": "2024-01-11T20:47:48+00:00" + "time": "2024-02-16T15:06:51+00:00" }, { "name": "symfony/browser-kit", @@ -13321,16 +13321,16 @@ }, { "name": "symfony/flex", - "version": "v1.21.4", + "version": "v1.21.5", "source": { "type": "git", "url": "https://github.com/symfony/flex.git", - "reference": "7b40eec950ded5de7054f807c209d3c612efe517" + "reference": "6b46a001639f810d01f4f1b39be1291192a711d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/flex/zipball/7b40eec950ded5de7054f807c209d3c612efe517", - "reference": "7b40eec950ded5de7054f807c209d3c612efe517", + "url": "https://api.github.com/repos/symfony/flex/zipball/6b46a001639f810d01f4f1b39be1291192a711d4", + "reference": "6b46a001639f810d01f4f1b39be1291192a711d4", "shasum": "" }, "require": { @@ -13366,7 +13366,7 @@ "description": "Composer plugin for Symfony", "support": { "issues": "https://github.com/symfony/flex/issues", - "source": "https://github.com/symfony/flex/tree/v1.21.4" + "source": "https://github.com/symfony/flex/tree/v1.21.5" }, "funding": [ { @@ -13382,7 +13382,7 @@ "type": "tidelift" } ], - "time": "2024-01-02T11:08:17+00:00" + "time": "2024-02-05T18:04:39+00:00" }, { "name": "symfony/http-foundation", @@ -14400,16 +14400,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179" + "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179", - "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25", + "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25", "shasum": "" }, "require": { @@ -14417,9 +14417,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -14456,7 +14453,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0" }, "funding": [ { @@ -14472,20 +14469,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5" + "reference": "21bd091060673a1177ae842c0ef8fe30893114d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5", - "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2", + "reference": "21bd091060673a1177ae842c0ef8fe30893114d2", "shasum": "" }, "require": { @@ -14493,9 +14490,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -14535,7 +14529,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0" }, "funding": [ { @@ -14551,20 +14545,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", "shasum": "" }, "require": { @@ -14572,9 +14566,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -14618,7 +14609,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" }, "funding": [ { @@ -14634,20 +14625,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" + "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", - "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d", + "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d", "shasum": "" }, "require": { @@ -14655,9 +14646,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -14697,7 +14685,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0" }, "funding": [ { @@ -14713,20 +14701,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php82", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php82.git", - "reference": "7716bea9c86776fb3362d6b52fe1fc9471056a49" + "reference": "559d488c38784112c78b9bf17c5ce8366a265643" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/7716bea9c86776fb3362d6b52fe1fc9471056a49", - "reference": "7716bea9c86776fb3362d6b52fe1fc9471056a49", + "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/559d488c38784112c78b9bf17c5ce8366a265643", + "reference": "559d488c38784112c78b9bf17c5ce8366a265643", "shasum": "" }, "require": { @@ -14734,9 +14722,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -14776,7 +14761,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php82/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php82/tree/v1.29.0" }, "funding": [ { @@ -14792,7 +14777,7 @@ "type": "tidelift" } ], - "time": "2023-08-25T17:27:25+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php83", @@ -14876,16 +14861,16 @@ }, { "name": "symfony/polyfill-uuid", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-uuid.git", - "reference": "9c44518a5aff8da565c8a55dbe85d2769e6f630e" + "reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/9c44518a5aff8da565c8a55dbe85d2769e6f630e", - "reference": "9c44518a5aff8da565c8a55dbe85d2769e6f630e", + "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/3abdd21b0ceaa3000ee950097bc3cf9efc137853", + "reference": "3abdd21b0ceaa3000ee950097bc3cf9efc137853", "shasum": "" }, "require": { @@ -14899,9 +14884,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -14938,7 +14920,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/polyfill-uuid/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-uuid/tree/v1.29.0" }, "funding": [ { @@ -14954,7 +14936,7 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/process", @@ -15529,16 +15511,16 @@ }, { "name": "symfony/uid", - "version": "v5.4.31", + "version": "v5.4.35", "source": { "type": "git", "url": "https://github.com/symfony/uid.git", - "reference": "d76766c457aacff7acea4482c207231aea93362c" + "reference": "c280434b875236cd2b1bed1505aecc6141db73e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/uid/zipball/d76766c457aacff7acea4482c207231aea93362c", - "reference": "d76766c457aacff7acea4482c207231aea93362c", + "url": "https://api.github.com/repos/symfony/uid/zipball/c280434b875236cd2b1bed1505aecc6141db73e8", + "reference": "c280434b875236cd2b1bed1505aecc6141db73e8", "shasum": "" }, "require": { @@ -15583,7 +15565,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/uid/tree/v5.4.31" + "source": "https://github.com/symfony/uid/tree/v5.4.35" }, "funding": [ { @@ -15599,7 +15581,7 @@ "type": "tidelift" } ], - "time": "2023-10-31T07:58:33+00:00" + "time": "2024-01-23T13:51:25+00:00" }, { "name": "symfony/validator", @@ -16750,16 +16732,16 @@ }, { "name": "symfony/config", - "version": "v7.0.0", + "version": "v7.0.3", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "8789646600f4e7e451dde9e1dc81cfa429f3857a" + "reference": "86a5027869ca3d6bdecae6d5d6c2f77c8f2c1d16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/8789646600f4e7e451dde9e1dc81cfa429f3857a", - "reference": "8789646600f4e7e451dde9e1dc81cfa429f3857a", + "url": "https://api.github.com/repos/symfony/config/zipball/86a5027869ca3d6bdecae6d5d6c2f77c8f2c1d16", + "reference": "86a5027869ca3d6bdecae6d5d6c2f77c8f2c1d16", "shasum": "" }, "require": { @@ -16805,7 +16787,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v7.0.0" + "source": "https://github.com/symfony/config/tree/v7.0.3" }, "funding": [ { @@ -16821,7 +16803,7 @@ "type": "tidelift" } ], - "time": "2023-11-09T08:30:23+00:00" + "time": "2024-01-30T08:34:29+00:00" }, { "name": "weitzman/drupal-test-traits", diff --git a/composer.patches.json b/composer.patches.json index 5cefb010..3ed02739 100644 --- a/composer.patches.json +++ b/composer.patches.json @@ -1,7 +1,7 @@ { "patches": { "drupal/core": { - "https://www.drupal.org/project/drupal/issues/2544110": "./patches/2544110.patch", + "https://www.drupal.org/project/drupal/issues/2544110": "./patches/2544110-2024-02-15.patch", "Issue #3392572: strnatcasecmp(): Passing null to parameter #2 in LayoutPluginManager": "https://www.drupal.org/files/issues/2023-10-25/drupal-strnatcasecmp_string_only-3392572-10.patch", "Issue #3413079: Cannot read properties of null (reading 'nodeType') on node.page.body": "https://www.drupal.org/files/issues/2024-01-08/3413079-9.patch", "Issue #3413508: Admin page access denied even when access is given to child items": "./patches/3413508.patch" diff --git a/patches/2544110.patch b/patches/2544110-2024-02-15.patch similarity index 90% rename from patches/2544110.patch rename to patches/2544110-2024-02-15.patch index 87b93e95..fbc5919e 100644 --- a/patches/2544110.patch +++ b/patches/2544110-2024-02-15.patch @@ -1,5 +1,15 @@ +From 3cf003dbb423405425d79c5dccde327669b801bc Mon Sep 17 00:00:00 2001 +From: Lucas D Hedding +Date: Tue, 26 Dec 2023 12:37:36 -0600 +Subject: [PATCH] rebase + +--- + core/lib/Drupal/Component/Utility/Xss.php | 107 +++++++++++++++--- + .../Tests/Component/Utility/XssTest.php | 97 +++++++++++++++- + 2 files changed, 190 insertions(+), 14 deletions(-) + diff --git a/core/lib/Drupal/Component/Utility/Xss.php b/core/lib/Drupal/Component/Utility/Xss.php -index 7480c3793eeba30cf8926df645d1d0f37bb9aa4b..e16f021b4d05b4e7b2ff3ffe9409227e5eb48d80 100644 +index 2c143cddf84b..b0e77605194f 100644 --- a/core/lib/Drupal/Component/Utility/Xss.php +++ b/core/lib/Drupal/Component/Utility/Xss.php @@ -2,7 +2,7 @@ @@ -66,7 +76,7 @@ index 7480c3793eeba30cf8926df645d1d0f37bb9aa4b..e16f021b4d05b4e7b2ff3ffe9409227e while (strlen($attributes) != 0) { // Was the last operation successful? -@@ -229,17 +270,16 @@ protected static function attributes($attributes) { +@@ -229,18 +270,16 @@ protected static function attributes($attributes) { // starting with "javascript:"). However, for some non-URI // attributes performing this filtering causes valid and safe data // to be mangled. We prevent this by skipping protocol filtering on @@ -74,7 +84,7 @@ index 7480c3793eeba30cf8926df645d1d0f37bb9aa4b..e16f021b4d05b4e7b2ff3ffe9409227e + // such attributes. Adding check to skip angular attributes (ng). // @see \Drupal\Component\Utility\UrlHelper::filterBadProtocol() // @see http://www.w3.org/TR/html4/index/attributes.html -- $skip_protocol_filtering = substr($attribute_name, 0, 5) === 'data-' || in_array($attribute_name, [ +- $skip_protocol_filtering = str_starts_with($attribute_name, 'data-') || in_array($attribute_name, [ - 'title', - 'alt', - 'rel', @@ -82,17 +92,17 @@ index 7480c3793eeba30cf8926df645d1d0f37bb9aa4b..e16f021b4d05b4e7b2ff3ffe9409227e - 'class', - 'datetime', - ]); -+ $skip_protocol_filtering = substr($attribute_name, 0, 5) === 'data-' || -+ substr($attribute_name, 0, 3) === 'ng-' || ++ $skip_protocol_filtering = str_starts_with($attribute_name, 'data-') || ++ str_starts_with($attribute_name, 'ng-') || + in_array($attribute_name, static::$safeAttributes); -+ + + // There are also certain attributes that we want to make sure we + // filter no matter what. + $enforce_protocol_filtering = in_array($attribute_name, static::$unSafeAttributes); - $working = $mode = 1; $attributes = preg_replace('/^[-a-zA-Z][-a-zA-Z0-9]*/', '', $attributes); -@@ -272,7 +312,12 @@ protected static function attributes($attributes) { + } +@@ -272,7 +311,12 @@ protected static function attributes($attributes) { $working = 1; // Attribute value, a URL after href= for instance. if (preg_match('/^"([^"]*)"(\s+|$)/', $attributes, $match)) { @@ -106,7 +116,7 @@ index 7480c3793eeba30cf8926df645d1d0f37bb9aa4b..e16f021b4d05b4e7b2ff3ffe9409227e if (!$skip) { $attributes_array[] = "$attribute_name=\"$value\""; -@@ -282,7 +327,12 @@ protected static function attributes($attributes) { +@@ -282,7 +326,12 @@ protected static function attributes($attributes) { } if (preg_match("/^'([^']*)'(\s+|$)/", $attributes, $match)) { @@ -120,7 +130,7 @@ index 7480c3793eeba30cf8926df645d1d0f37bb9aa4b..e16f021b4d05b4e7b2ff3ffe9409227e if (!$skip) { $attributes_array[] = "$attribute_name='$value'"; -@@ -292,7 +342,12 @@ protected static function attributes($attributes) { +@@ -292,7 +341,12 @@ protected static function attributes($attributes) { } if (preg_match("%^([^\s\"']+)(\s+|$)%", $attributes, $match)) { @@ -134,7 +144,7 @@ index 7480c3793eeba30cf8926df645d1d0f37bb9aa4b..e16f021b4d05b4e7b2ff3ffe9409227e if (!$skip) { $attributes_array[] = "$attribute_name=\"$value\""; -@@ -341,6 +396,33 @@ protected static function needsRemoval(array $html_tags, $elem) { +@@ -341,6 +395,33 @@ protected static function needsRemoval(array $html_tags, $elem) { return !isset($html_tags[strtolower($elem)]); } @@ -169,7 +179,7 @@ index 7480c3793eeba30cf8926df645d1d0f37bb9aa4b..e16f021b4d05b4e7b2ff3ffe9409227e * Gets the list of HTML tags allowed by Xss::filterAdmin(). * diff --git a/core/tests/Drupal/Tests/Component/Utility/XssTest.php b/core/tests/Drupal/Tests/Component/Utility/XssTest.php -index 2cf89d233e6aa1656a09ae1b1386dd5a414f2c4b..63a5a0bef36f837ebeaddad0cf3f1e48fd6667e7 100644 +index 0f242959ebee..6c024b0ac818 100644 --- a/core/tests/Drupal/Tests/Component/Utility/XssTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/XssTest.php @@ -8,10 +8,11 @@ @@ -300,3 +310,6 @@ index 2cf89d233e6aa1656a09ae1b1386dd5a414f2c4b..63a5a0bef36f837ebeaddad0cf3f1e48 ]; } +-- +GitLab + From 529e749a245060ca03f99e1d6dc5687af80c2305 Mon Sep 17 00:00:00 2001 From: berliner Date: Thu, 22 Feb 2024 10:48:53 +0100 Subject: [PATCH 3/4] Remove update_status module --- composer.json | 1 - composer.lock | 392 +---------------------------- scripts/composer/ScriptHandler.php | 6 +- symfony.lock | 3 - 4 files changed, 6 insertions(+), 396 deletions(-) diff --git a/composer.json b/composer.json index 2be19d31..fbc0cfdc 100644 --- a/composer.json +++ b/composer.json @@ -88,7 +88,6 @@ "drupal/replicate_ui": "^1.0", "drupal/social_auth_hid": "^3.1", "drupal/stage_file_proxy": "^2", - "drupal/upgrade_status": "^4.0", "drupal/user_expire": "^1.0", "drupal/username_enumeration_prevention": "^1.3", "drush/drush": "^12.0", diff --git a/composer.lock b/composer.lock index be705058..bd3fcb17 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": "3cf8892a20727e8967173e77fcaa5f14", + "content-hash": "d3c703b694355c2eb17ba94c68f9fbd6", "packages": [ { "name": "asm89/stack-cors", @@ -1763,38 +1763,6 @@ }, "time": "2022-12-06T17:57:16+00:00" }, - { - "name": "container-interop/container-interop", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/container-interop/container-interop.git", - "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/container-interop/container-interop/zipball/fc08354828f8fd3245f77a66b9e23a6bca48297e", - "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e", - "shasum": "" - }, - "type": "library", - "autoload": { - "psr-4": { - "Interop\\Container\\": "src/Interop/Container/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", - "support": { - "issues": "https://github.com/container-interop/container-interop/issues", - "source": "https://github.com/container-interop/container-interop/tree/master" - }, - "abandoned": "psr/container", - "time": "2014-12-30T15:22:37+00:00" - }, { "name": "cweagans/composer-patches", "version": "1.7.3", @@ -6082,81 +6050,6 @@ "issues": "https://www.drupal.org/project/issues/typed_data" } }, - { - "name": "drupal/upgrade_status", - "version": "4.0.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/upgrade_status.git", - "reference": "4.0.0" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/upgrade_status-4.0.0.zip", - "reference": "4.0.0", - "shasum": "013afdb46a03c9db0119cb1ce60ca49631d64368" - }, - "require": { - "drupal/core": "^9 || ^10", - "mathieuviossat/arraytotexttable": "~1.0.0", - "mglaman/phpstan-drupal": "^1.0.0", - "nikic/php-parser": "^4.0.0", - "phpstan/phpstan-deprecation-rules": "^1.0.0", - "symfony/process": "^3.4|^4.0|^5.0|^6.0", - "webflo/drupal-finder": "^1.2" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "4.0.0", - "datestamp": "1678815090", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - }, - "drush": { - "services": { - "drush.services.yml": "^9 || ^10" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "colan", - "homepage": "https://www.drupal.org/user/58704" - }, - { - "name": "Gábor Hojtsy", - "homepage": "https://www.drupal.org/user/4166" - }, - { - "name": "herczogzoltan", - "homepage": "https://www.drupal.org/user/3528391" - }, - { - "name": "sun", - "homepage": "https://www.drupal.org/user/54136" - }, - { - "name": "webchick", - "homepage": "https://www.drupal.org/user/24967" - }, - { - "name": "xjm", - "homepage": "https://www.drupal.org/user/65776" - } - ], - "description": "Review Drupal major upgrade readiness of the environment and components of the site.", - "homepage": "http://drupal.org/project/upgrade_status", - "support": { - "source": "https://git.drupalcode.org/project/upgrade_status" - } - }, { "name": "drupal/user_expire", "version": "1.1.0", @@ -7683,57 +7576,6 @@ }, "time": "2023-05-10T11:58:31+00:00" }, - { - "name": "mathieuviossat/arraytotexttable", - "version": "v1.0.7", - "source": { - "type": "git", - "url": "https://github.com/viossat/arraytotexttable.git", - "reference": "df25fafc56cedd64fcdab5a1d8793d0e97e635e3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/viossat/arraytotexttable/zipball/df25fafc56cedd64fcdab5a1d8793d0e97e635e3", - "reference": "df25fafc56cedd64fcdab5a1d8793d0e97e635e3", - "shasum": "" - }, - "require": { - "php": ">=5.3.0", - "zendframework/zend-text": "^2.0.3" - }, - "type": "library", - "autoload": { - "psr-4": { - "MathieuViossat\\Util\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mathieu Viossat", - "email": "mathieu@viossat.fr", - "homepage": "https://viossat.fr" - } - ], - "description": "Display arrays in terminal", - "homepage": "https://github.com/viossat/arraytotexttable", - "keywords": [ - "array", - "ascii", - "table", - "terminal", - "text", - "unicode" - ], - "support": { - "issues": "https://github.com/viossat/arraytotexttable/issues", - "source": "https://github.com/viossat/arraytotexttable/tree/master" - }, - "time": "2019-05-15T14:51:03+00:00" - }, { "name": "mck89/peast", "version": "v1.15.4", @@ -16287,238 +16129,6 @@ } ], "time": "2023-07-05T14:23:37+00:00" - }, - { - "name": "zendframework/zend-hydrator", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-hydrator.git", - "reference": "f3ed8b833355140350bbed98d8a7b8b66875903f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/f3ed8b833355140350bbed98d8a7b8b66875903f", - "reference": "f3ed8b833355140350bbed98d8a7b8b66875903f", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "zendframework/zend-stdlib": "^2.5.1" - }, - "require-dev": { - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "^2.0@dev", - "zendframework/zend-eventmanager": "^2.5.1", - "zendframework/zend-filter": "^2.5.1", - "zendframework/zend-inputfilter": "^2.5.1", - "zendframework/zend-serializer": "^2.5.1", - "zendframework/zend-servicemanager": "^2.5.1" - }, - "suggest": { - "zendframework/zend-eventmanager": "^2.5.1, to support aggregate hydrator usage", - "zendframework/zend-filter": "^2.5.1, to support naming strategy hydrator usage", - "zendframework/zend-serializer": "^2.5.1, to use the SerializableStrategy", - "zendframework/zend-servicemanager": "^2.5.1, to support hydrator plugin manager usage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev", - "dev-develop": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Hydrator\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-hydrator", - "keywords": [ - "hydrator", - "zf2" - ], - "support": { - "issues": "https://github.com/zendframework/zend-hydrator/issues", - "source": "https://github.com/zendframework/zend-hydrator/tree/master" - }, - "abandoned": "laminas/laminas-hydrator", - "time": "2015-09-17T14:06:43+00:00" - }, - { - "name": "zendframework/zend-servicemanager", - "version": "2.6.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-servicemanager.git", - "reference": "1dc33f23bd0a7f4d8ba743b915fae523d356027a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/1dc33f23bd0a7f4d8ba743b915fae523d356027a", - "reference": "1dc33f23bd0a7f4d8ba743b915fae523d356027a", - "shasum": "" - }, - "require": { - "container-interop/container-interop": "~1.0", - "php": ">=5.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-di": "~2.5", - "zendframework/zend-mvc": "~2.5" - }, - "suggest": { - "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services", - "zendframework/zend-di": "Zend\\Di component" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\ServiceManager\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-servicemanager", - "keywords": [ - "servicemanager", - "zf2" - ], - "support": { - "issues": "https://github.com/zendframework/zend-servicemanager/issues", - "source": "https://github.com/zendframework/zend-servicemanager/tree/release-2.6.0" - }, - "abandoned": "laminas/laminas-servicemanager", - "time": "2015-07-23T21:49:08+00:00" - }, - { - "name": "zendframework/zend-stdlib", - "version": "2.7.4", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "cae029346a33663b998507f94962eb27de060683" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cae029346a33663b998507f94962eb27de060683", - "reference": "cae029346a33663b998507f94962eb27de060683", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "zendframework/zend-hydrator": "~1.0" - }, - "require-dev": { - "athletic/athletic": "~0.1", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-config": "~2.5", - "zendframework/zend-eventmanager": "~2.5", - "zendframework/zend-filter": "~2.5", - "zendframework/zend-inputfilter": "~2.5", - "zendframework/zend-serializer": "~2.5", - "zendframework/zend-servicemanager": "~2.5" - }, - "suggest": { - "zendframework/zend-eventmanager": "To support aggregate hydrator usage", - "zendframework/zend-filter": "To support naming strategy hydrator usage", - "zendframework/zend-serializer": "Zend\\Serializer component", - "zendframework/zend-servicemanager": "To support hydrator plugin manager usage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Stdlib\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-stdlib", - "keywords": [ - "stdlib", - "zf2" - ], - "support": { - "issues": "https://github.com/zendframework/zend-stdlib/issues", - "source": "https://github.com/zendframework/zend-stdlib/tree/release-2.7.4" - }, - "abandoned": "laminas/laminas-stdlib", - "time": "2015-10-15T15:57:32+00:00" - }, - { - "name": "zendframework/zend-text", - "version": "2.5.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-text.git", - "reference": "292cd64ba28be9e420126a64e4ae3528effd1491" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-text/zipball/292cd64ba28be9e420126a64e4ae3528effd1491", - "reference": "292cd64ba28be9e420126a64e4ae3528effd1491", - "shasum": "" - }, - "require": { - "php": ">=5.3.23", - "zendframework/zend-servicemanager": "~2.5", - "zendframework/zend-stdlib": "~2.5" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-config": "~2.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Text\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-text", - "keywords": [ - "text", - "zf2" - ], - "support": { - "issues": "https://github.com/zendframework/zend-text/issues", - "source": "https://github.com/zendframework/zend-text/tree/release-2.5.1" - }, - "abandoned": "laminas/laminas-text", - "time": "2015-06-03T15:32:03+00:00" } ], "packages-dev": [ diff --git a/scripts/composer/ScriptHandler.php b/scripts/composer/ScriptHandler.php index bc22b416..73b788d6 100644 --- a/scripts/composer/ScriptHandler.php +++ b/scripts/composer/ScriptHandler.php @@ -10,6 +10,7 @@ use Composer\Script\Event; use Composer\Semver\Comparator; use Drupal\Core\Site\Settings; +use Drupal\Core\Site\SettingsEditor; use DrupalFinder\DrupalFinder; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Filesystem\Exception\IOException; @@ -49,7 +50,10 @@ public static function createRequiredFiles(Event $event) { 'required' => TRUE, ], ]; - drupal_rewrite_settings($settings, $drupalRoot . '/sites/default/settings.php'); + SettingsEditor::rewrite( + $drupalRoot . '/sites/default/settings.php', + $settings + ); $fs->chmod($drupalRoot . '/sites/default/settings.php', 0666); $event->getIO()->write("Create a sites/default/settings.php file with chmod 0666"); diff --git a/symfony.lock b/symfony.lock index 57709f26..e7c6379d 100644 --- a/symfony.lock +++ b/symfony.lock @@ -35,9 +35,6 @@ "composer/xdebug-handler": { "version": "1.4.5" }, - "container-interop/container-interop": { - "version": "1.2.0" - }, "cweagans/composer-patches": { "version": "1.7.1" }, From dfff9d06db60b7dacb8ba6a0bc9c7cbb3390725f Mon Sep 17 00:00:00 2001 From: berliner Date: Thu, 22 Feb 2024 11:55:00 +0100 Subject: [PATCH 4/4] Hide field from preview, update config --- config/admin_dialogs.settings.yml | 6 +++--- ...iew_display.paragraph.document_chapter.default.yml | 11 +---------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/config/admin_dialogs.settings.yml b/config/admin_dialogs.settings.yml index 8360cf2f..3aed7833 100644 --- a/config/admin_dialogs.settings.yml +++ b/config/admin_dialogs.settings.yml @@ -1,5 +1,5 @@ _core: default_config_hash: srQdbmKHrvRxR6vFtEFbCHIT_Ae5obHqc-Hkh7b3_sw -delete_ops: 1 -delete_buttons: 1 -other_buttons: 1 +delete_ops: true +delete_buttons: true +other_buttons: true diff --git a/config/core.entity_view_display.paragraph.document_chapter.default.yml b/config/core.entity_view_display.paragraph.document_chapter.default.yml index 97348b77..9d0f8673 100644 --- a/config/core.entity_view_display.paragraph.document_chapter.default.yml +++ b/config/core.entity_view_display.paragraph.document_chapter.default.yml @@ -24,16 +24,6 @@ content: third_party_settings: { } weight: 2 region: content - field_hide_from_navigation: - type: boolean - label: above - settings: - format: default - format_custom_false: '' - format_custom_true: '' - third_party_settings: { } - weight: 3 - region: content field_summary: type: basic_string label: hidden @@ -50,5 +40,6 @@ content: weight: 0 region: content hidden: + field_hide_from_navigation: true field_short_title: true field_tags: true