From b5d1e06bfc9ca68156643bcd05accca29e77e182 Mon Sep 17 00:00:00 2001 From: drishu Date: Fri, 4 Nov 2022 10:31:33 +0200 Subject: [PATCH] OEL-2102: Upgrade drupal core to version 9.4.8. --- composer.json | 3 +- composer.lock | 253 +++++++++++++++++--------------------------------- 2 files changed, 84 insertions(+), 172 deletions(-) diff --git a/composer.json b/composer.json index e0dda672..703d0f33 100644 --- a/composer.json +++ b/composer.json @@ -115,8 +115,7 @@ "installer-types": ["npm-asset", "bower-asset"], "patches": { "drupal/core": { - "Allow altering the post_update run order @see https://www.drupal.org/project/drupal/issues/3129231": "https://www.drupal.org/files/issues/2022-06-27/drupal-post_update_alter-3129231-20.patch", - "Incorrect label in taxonomy glossary for terms that start with zero @see https://www.drupal.org/project/drupal/issues/3291520": "https://www.drupal.org/files/issues/2022-08-01/3291520-12.patch" + "Allow altering the post_update run order @see https://www.drupal.org/project/drupal/issues/3129231": "https://www.drupal.org/files/issues/2022-06-27/drupal-post_update_alter-3129231-20.patch" } }, "artifacts": { diff --git a/composer.lock b/composer.lock index 602bbdf3..a813acc4 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": "7721e972505dbb6a8a55e906fc273071", + "content-hash": "43c6f011cec4fd1327c447b59b0b4b2b", "packages": [ { "name": "asm89/stack-cors", @@ -1301,16 +1301,16 @@ }, { "name": "drupal/core", - "version": "9.4.3", + "version": "9.4.8", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "7b1a403c093c7abc89ef3df1a6b05bdb19b3ffad" + "reference": "a627d1b2a00f2cef0572e37b94dea298800541f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/7b1a403c093c7abc89ef3df1a6b05bdb19b3ffad", - "reference": "7b1a403c093c7abc89ef3df1a6b05bdb19b3ffad", + "url": "https://api.github.com/repos/drupal/core/zipball/a627d1b2a00f2cef0572e37b94dea298800541f4", + "reference": "a627d1b2a00f2cef0572e37b94dea298800541f4", "shasum": "" }, "require": { @@ -1356,7 +1356,7 @@ "symfony/translation": "^4.4", "symfony/validator": "^4.4", "symfony/yaml": "^4.4.19", - "twig/twig": "^2.15", + "twig/twig": "^2.15.3", "typo3/phar-stream-wrapper": "^3.1.3" }, "conflict": { @@ -1364,29 +1364,6 @@ "symfony/http-foundation": "4.4.42" }, "replace": { - "drupal/action": "self.version", - "drupal/aggregator": "self.version", - "drupal/automated_cron": "self.version", - "drupal/ban": "self.version", - "drupal/bartik": "self.version", - "drupal/basic_auth": "self.version", - "drupal/big_pipe": "self.version", - "drupal/block": "self.version", - "drupal/block_content": "self.version", - "drupal/book": "self.version", - "drupal/breakpoint": "self.version", - "drupal/ckeditor": "self.version", - "drupal/ckeditor5": "self.version", - "drupal/claro": "self.version", - "drupal/classy": "self.version", - "drupal/color": "self.version", - "drupal/comment": "self.version", - "drupal/config": "self.version", - "drupal/config_translation": "self.version", - "drupal/contact": "self.version", - "drupal/content_moderation": "self.version", - "drupal/content_translation": "self.version", - "drupal/contextual": "self.version", "drupal/core-annotation": "self.version", "drupal/core-assertion": "self.version", "drupal/core-bridge": "self.version", @@ -1411,75 +1388,7 @@ "drupal/core-transliteration": "self.version", "drupal/core-utility": "self.version", "drupal/core-uuid": "self.version", - "drupal/core-version": "self.version", - "drupal/datetime": "self.version", - "drupal/datetime_range": "self.version", - "drupal/dblog": "self.version", - "drupal/dynamic_page_cache": "self.version", - "drupal/editor": "self.version", - "drupal/entity_reference": "self.version", - "drupal/field": "self.version", - "drupal/field_layout": "self.version", - "drupal/field_ui": "self.version", - "drupal/file": "self.version", - "drupal/filter": "self.version", - "drupal/forum": "self.version", - "drupal/hal": "self.version", - "drupal/help": "self.version", - "drupal/help_topics": "self.version", - "drupal/history": "self.version", - "drupal/image": "self.version", - "drupal/inline_form_errors": "self.version", - "drupal/jsonapi": "self.version", - "drupal/language": "self.version", - "drupal/layout_builder": "self.version", - "drupal/layout_discovery": "self.version", - "drupal/link": "self.version", - "drupal/locale": "self.version", - "drupal/media": "self.version", - "drupal/media_library": "self.version", - "drupal/menu_link_content": "self.version", - "drupal/menu_ui": "self.version", - "drupal/migrate": "self.version", - "drupal/migrate_drupal": "self.version", - "drupal/migrate_drupal_multilingual": "self.version", - "drupal/migrate_drupal_ui": "self.version", - "drupal/minimal": "self.version", - "drupal/mysql": "self.version", - "drupal/node": "self.version", - "drupal/olivero": "self.version", - "drupal/options": "self.version", - "drupal/page_cache": "self.version", - "drupal/path": "self.version", - "drupal/path_alias": "self.version", - "drupal/pgsql": "self.version", - "drupal/quickedit": "self.version", - "drupal/rdf": "self.version", - "drupal/responsive_image": "self.version", - "drupal/rest": "self.version", - "drupal/search": "self.version", - "drupal/serialization": "self.version", - "drupal/settings_tray": "self.version", - "drupal/seven": "self.version", - "drupal/shortcut": "self.version", - "drupal/sqlite": "self.version", - "drupal/standard": "self.version", - "drupal/stark": "self.version", - "drupal/statistics": "self.version", - "drupal/syslog": "self.version", - "drupal/system": "self.version", - "drupal/taxonomy": "self.version", - "drupal/telephone": "self.version", - "drupal/text": "self.version", - "drupal/toolbar": "self.version", - "drupal/tour": "self.version", - "drupal/tracker": "self.version", - "drupal/update": "self.version", - "drupal/user": "self.version", - "drupal/views": "self.version", - "drupal/views_ui": "self.version", - "drupal/workflows": "self.version", - "drupal/workspaces": "self.version" + "drupal/core-version": "self.version" }, "type": "drupal-core", "extra": { @@ -1553,22 +1462,22 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/9.4.3" + "source": "https://github.com/drupal/core/tree/9.4.8" }, - "time": "2022-07-20T15:11:38+00:00" + "time": "2022-10-06T15:57:08+00:00" }, { "name": "drupal/core-recommended", - "version": "9.4.3", + "version": "9.4.8", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "ff8662af0a5963a88ea856e9786e17a51f8e640c" + "reference": "684cc844f7b729286f5d62f1ee4b20ab12586502" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/ff8662af0a5963a88ea856e9786e17a51f8e640c", - "reference": "ff8662af0a5963a88ea856e9786e17a51f8e640c", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/684cc844f7b729286f5d62f1ee4b20ab12586502", + "reference": "684cc844f7b729286f5d62f1ee4b20ab12586502", "shasum": "" }, "require": { @@ -1577,12 +1486,12 @@ "doctrine/annotations": "~1.13.2", "doctrine/lexer": "~1.2.3", "doctrine/reflection": "~1.2.3", - "drupal/core": "9.4.3", + "drupal/core": "9.4.8", "egulias/email-validator": "~3.2", "guzzlehttp/guzzle": "~6.5.8", "guzzlehttp/promises": "~1.5.1", "guzzlehttp/psr7": "~1.9.0", - "laminas/laminas-diactoros": "~2.11.0", + "laminas/laminas-diactoros": "~2.11.1", "laminas/laminas-escaper": "~2.9.0", "laminas/laminas-feed": "~2.17.0", "laminas/laminas-stdlib": "~3.7.1", @@ -1626,7 +1535,7 @@ "symfony/validator": "~v4.4.41", "symfony/var-dumper": "~v5.4.9", "symfony/yaml": "~v4.4.37", - "twig/twig": "~v2.15.1", + "twig/twig": "~v2.15.3", "typo3/phar-stream-wrapper": "~v3.1.7" }, "conflict": { @@ -1639,9 +1548,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/9.4.3" + "source": "https://github.com/drupal/core-recommended/tree/9.4.8" }, - "time": "2022-07-20T15:11:38+00:00" + "time": "2022-10-06T15:57:08+00:00" }, { "name": "drupal/csv_serialization", @@ -1884,30 +1793,30 @@ }, { "name": "drupal/default_content", - "version": "2.0.0-alpha1", + "version": "2.0.0-alpha2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/default_content.git", - "reference": "2.0.0-alpha1" + "reference": "2.0.0-alpha2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/default_content-2.0.0-alpha1.zip", - "reference": "2.0.0-alpha1", - "shasum": "0d534ab8e44786a352e24c7cec3dc06bef155f66" + "url": "https://ftp.drupal.org/files/projects/default_content-2.0.0-alpha2.zip", + "reference": "2.0.0-alpha2", + "shasum": "5c365ea21b0be63dc00ec2db50179291d6fb3d89" }, "require": { - "drupal/core": "^8.7.7 || ^9", - "drupal/hal": "*" + "drupal/core": "^9.1 || ^10" }, "require-dev": { + "drupal/hal": " ^9 || ^1 || ^2", "drupal/paragraphs": "^1" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0-alpha1", - "datestamp": "1595072288", + "version": "2.0.0-alpha2", + "datestamp": "1659466706", "security-coverage": { "status": "not-covered", "message": "Alpha releases are not covered by Drupal security advisories." @@ -1915,7 +1824,7 @@ }, "drush": { "services": { - "drush.services.yml": "^9" + "drush.services.yml": "^9 || ^10 || ^11" } } }, @@ -12264,16 +12173,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.3.3", + "version": "1.3.4", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c" + "reference": "69098eca243998b53eed7a48d82dedd28b447cd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/30897edbfb15e784fe55587b4f73ceefd3c4d98c", - "reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/69098eca243998b53eed7a48d82dedd28b447cd5", + "reference": "69098eca243998b53eed7a48d82dedd28b447cd5", "shasum": "" }, "require": { @@ -12320,7 +12229,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.3.3" + "source": "https://github.com/composer/ca-bundle/tree/1.3.4" }, "funding": [ { @@ -12336,7 +12245,7 @@ "type": "tidelift" } ], - "time": "2022-07-20T07:14:26+00:00" + "time": "2022-10-12T12:08:29+00:00" }, { "name": "composer/composer", @@ -13741,7 +13650,7 @@ }, { "name": "drupal/core-composer-scaffold", - "version": "9.4.6", + "version": "9.4.8", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -13785,13 +13694,13 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/9.4.6" + "source": "https://github.com/drupal/core-composer-scaffold/tree/9.4.8" }, "time": "2022-06-19T16:14:23+00:00" }, { "name": "drupal/core-dev", - "version": "9.4.6", + "version": "9.4.8", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", @@ -13835,7 +13744,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/9.4.6" + "source": "https://github.com/drupal/core-dev/tree/9.4.8" }, "time": "2022-04-14T00:37:13+00:00" }, @@ -14350,16 +14259,16 @@ }, { "name": "instaclick/php-webdriver", - "version": "1.4.15", + "version": "1.4.16", "source": { "type": "git", "url": "https://github.com/instaclick/php-webdriver.git", - "reference": "ed8f7741a0952db42686aae0780a0935138a7cf8" + "reference": "a39a1f6dc0f4ddd8b2438fa5eb1f67755730d606" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/ed8f7741a0952db42686aae0780a0935138a7cf8", - "reference": "ed8f7741a0952db42686aae0780a0935138a7cf8", + "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/a39a1f6dc0f4ddd8b2438fa5eb1f67755730d606", + "reference": "a39a1f6dc0f4ddd8b2438fa5eb1f67755730d606", "shasum": "" }, "require": { @@ -14407,9 +14316,9 @@ ], "support": { "issues": "https://github.com/instaclick/php-webdriver/issues", - "source": "https://github.com/instaclick/php-webdriver/tree/1.4.15" + "source": "https://github.com/instaclick/php-webdriver/tree/1.4.16" }, - "time": "2022-08-09T14:26:29+00:00" + "time": "2022-10-28T13:30:35+00:00" }, { "name": "jakeasmith/http_build_url", @@ -15861,16 +15770,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.8.0", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "8dd908dd6156e974b9a0f8bb4cd5ad0707830f04" + "reference": "33aefcdab42900e36366d0feab6206e2dd68f947" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/8dd908dd6156e974b9a0f8bb4cd5ad0707830f04", - "reference": "8dd908dd6156e974b9a0f8bb4cd5ad0707830f04", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/33aefcdab42900e36366d0feab6206e2dd68f947", + "reference": "33aefcdab42900e36366d0feab6206e2dd68f947", "shasum": "" }, "require": { @@ -15900,9 +15809,9 @@ "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.8.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.13.0" }, - "time": "2022-09-04T18:59:06+00:00" + "time": "2022-10-21T09:57:39+00:00" }, { "name": "phpunit/php-code-coverage", @@ -17553,16 +17462,16 @@ }, { "name": "sirbrillig/phpcs-variable-analysis", - "version": "v2.11.8", + "version": "v2.11.9", "source": { "type": "git", "url": "https://github.com/sirbrillig/phpcs-variable-analysis.git", - "reference": "aaf902277f2889fddbdb37046ae02b9965e2cf0f" + "reference": "62730888d225d55a613854b6a76fb1f9f57d1618" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/aaf902277f2889fddbdb37046ae02b9965e2cf0f", - "reference": "aaf902277f2889fddbdb37046ae02b9965e2cf0f", + "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/62730888d225d55a613854b6a76fb1f9f57d1618", + "reference": "62730888d225d55a613854b6a76fb1f9f57d1618", "shasum": "" }, "require": { @@ -17607,36 +17516,36 @@ "source": "https://github.com/sirbrillig/phpcs-variable-analysis", "wiki": "https://github.com/sirbrillig/phpcs-variable-analysis/wiki" }, - "time": "2022-09-08T18:35:53+00:00" + "time": "2022-10-05T23:31:46+00:00" }, { "name": "slevomat/coding-standard", - "version": "8.5.1", + "version": "8.6.2", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "971f489404350bf4608b7e59381e603c47700366" + "reference": "080f592b16f021a3a8e43d95ca8f57b87ddcf4e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/971f489404350bf4608b7e59381e603c47700366", - "reference": "971f489404350bf4608b7e59381e603c47700366", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/080f592b16f021a3a8e43d95ca8f57b87ddcf4e6", + "reference": "080f592b16f021a3a8e43d95ca8f57b87ddcf4e6", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", "php": "^7.2 || ^8.0", - "phpstan/phpdoc-parser": ">=1.7.0 <1.9.0", + "phpstan/phpdoc-parser": ">=1.11.0 <1.14.0", "squizlabs/php_codesniffer": "^3.7.1" }, "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.4.10|1.8.5", + "phpstan/phpstan": "1.4.10|1.8.10", "phpstan/phpstan-deprecation-rules": "1.0.0", "phpstan/phpstan-phpunit": "1.0.0|1.1.1", - "phpstan/phpstan-strict-rules": "1.4.3", - "phpunit/phpunit": "7.5.20|8.5.21|9.5.24" + "phpstan/phpstan-strict-rules": "1.4.4", + "phpunit/phpunit": "7.5.20|8.5.21|9.5.25" }, "type": "phpcodesniffer-standard", "extra": { @@ -17654,9 +17563,13 @@ "MIT" ], "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", + "keywords": [ + "dev", + "phpcs" + ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.5.1" + "source": "https://github.com/slevomat/coding-standard/tree/8.6.2" }, "funding": [ { @@ -17668,7 +17581,7 @@ "type": "tidelift" } ], - "time": "2022-09-23T05:34:53+00:00" + "time": "2022-10-22T15:42:49+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -18214,16 +18127,16 @@ }, { "name": "symfony/lock", - "version": "v4.4.40", + "version": "v4.4.46", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", - "reference": "ec23fb51d9b531f7fcd2279afe5b474e624c2445" + "reference": "8b060dd4e10f05219698ceb3a4ad735b19c1be4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/lock/zipball/ec23fb51d9b531f7fcd2279afe5b474e624c2445", - "reference": "ec23fb51d9b531f7fcd2279afe5b474e624c2445", + "url": "https://api.github.com/repos/symfony/lock/zipball/8b060dd4e10f05219698ceb3a4ad735b19c1be4f", + "reference": "8b060dd4e10f05219698ceb3a4ad735b19c1be4f", "shasum": "" }, "require": { @@ -18232,10 +18145,10 @@ "symfony/polyfill-php80": "^1.16" }, "conflict": { - "doctrine/dbal": "<2.6" + "doctrine/dbal": "<2.7" }, "require-dev": { - "doctrine/dbal": "^2.6|^3.0", + "doctrine/dbal": "^2.7|^3.0", "predis/predis": "~1.0" }, "type": "library", @@ -18272,7 +18185,7 @@ "semaphore" ], "support": { - "source": "https://github.com/symfony/lock/tree/v4.4.40" + "source": "https://github.com/symfony/lock/tree/v4.4.46" }, "funding": [ { @@ -18288,20 +18201,20 @@ "type": "tidelift" } ], - "time": "2022-03-22T11:09:53+00:00" + "time": "2022-09-19T08:41:12+00:00" }, { "name": "symfony/phpunit-bridge", - "version": "v5.4.11", + "version": "v5.4.14", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "31b1549f54b1a1890e725a0c1c8c2de6ef2205b3" + "reference": "684084f74504c234462fafe6f5eea003a73e7e75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/31b1549f54b1a1890e725a0c1c8c2de6ef2205b3", - "reference": "31b1549f54b1a1890e725a0c1c8c2de6ef2205b3", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/684084f74504c234462fafe6f5eea003a73e7e75", + "reference": "684084f74504c234462fafe6f5eea003a73e7e75", "shasum": "" }, "require": { @@ -18355,7 +18268,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.11" + "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.14" }, "funding": [ { @@ -18371,7 +18284,7 @@ "type": "tidelift" } ], - "time": "2022-07-28T13:33:28+00:00" + "time": "2022-10-07T08:01:20+00:00" }, { "name": "symfony/polyfill-php81",