From 802021f10b5936ed47c8ef6a7c18085d3e58f88f Mon Sep 17 00:00:00 2001 From: bach Date: Tue, 13 Apr 2021 22:23:55 +0200 Subject: [PATCH] updated core, patched core to fix drupal_migrate --- composer.json | 3 + composer.lock | 198 ++++++++++++++++++++------------------------------ 2 files changed, 83 insertions(+), 118 deletions(-) diff --git a/composer.json b/composer.json index da42ff61..7b33d463 100644 --- a/composer.json +++ b/composer.json @@ -100,6 +100,9 @@ "patches": { "drupal/jquery_ui_touch_punch": { "jQuery UI Touch Punch library https://www.drupal.org/project/jquery_ui_touch_punch/issues/3159222":"https://www.drupal.org/files/issues/2021-02-26/jquery_ui_touch_punch.patch" + }, + "drupal/core": { + "Call to a member function getSetting() on null migrate_drupal https://www.drupal.org/project/drupal/issues/2984460": "https://www.drupal.org/files/issues/2020-04-06/2984460-3.patch" } } } diff --git a/composer.lock b/composer.lock index d235a53d..43208c28 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": "226ef1904a61f57f9f260056a5f3b9f1", + "content-hash": "e0fece79193f65058301317f7554e37a", "packages": [ { "name": "alchemy/zippy", @@ -1351,43 +1351,6 @@ }, "time": "2012-10-28T21:08:28+00:00" }, - { - "name": "dnoegel/php-xdg-base-dir", - "version": "v0.1.1", - "source": { - "type": "git", - "url": "https://github.com/dnoegel/php-xdg-base-dir.git", - "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", - "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35" - }, - "type": "library", - "autoload": { - "psr-4": { - "XdgBaseDir\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "implementation of xdg base directory specification for php", - "support": { - "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues", - "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1" - }, - "time": "2019-12-04T15:06:13+00:00" - }, { "name": "doctrine/annotations", "version": "1.11.1", @@ -2783,7 +2746,7 @@ "extra": { "drupal": { "version": "8.x-1.3", - "datestamp": "1604426178", + "datestamp": "1615217722", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3615,16 +3578,16 @@ }, { "name": "drupal/core", - "version": "9.1.5", + "version": "9.1.6", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "075ea2e792edbe573a29f02e80d6edf445f18e14" + "reference": "775b801f12bbcfb0634b2ae442c5ed4529b3150d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/075ea2e792edbe573a29f02e80d6edf445f18e14", - "reference": "075ea2e792edbe573a29f02e80d6edf445f18e14", + "url": "https://api.github.com/repos/drupal/core/zipball/775b801f12bbcfb0634b2ae442c5ed4529b3150d", + "reference": "775b801f12bbcfb0634b2ae442c5ed4529b3150d", "shasum": "" }, "require": { @@ -3861,13 +3824,13 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/9.1.5" + "source": "https://github.com/drupal/core/tree/9.1.6" }, - "time": "2021-03-04T14:36:14+00:00" + "time": "2021-04-07T11:18:45+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "9.1.5", + "version": "9.1.6", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -3911,13 +3874,13 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/9.1.5" + "source": "https://github.com/drupal/core-composer-scaffold/tree/9.1.6" }, "time": "2020-08-07T22:30:13+00:00" }, { "name": "drupal/core-project-message", - "version": "9.1.5", + "version": "9.1.6", "source": { "type": "git", "url": "https://github.com/drupal/core-project-message.git", @@ -3952,22 +3915,22 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-project-message/tree/9.1.5" + "source": "https://github.com/drupal/core-project-message/tree/9.1.6" }, "time": "2020-09-14T13:40:36+00:00" }, { "name": "drupal/core-recommended", - "version": "9.1.5", + "version": "9.1.6", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "809cd5dd382f95abf1e81abf8910c0eb9c97f012" + "reference": "03a5765123d9c76e0ca2ab3de26059356193d35c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/809cd5dd382f95abf1e81abf8910c0eb9c97f012", - "reference": "809cd5dd382f95abf1e81abf8910c0eb9c97f012", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/03a5765123d9c76e0ca2ab3de26059356193d35c", + "reference": "03a5765123d9c76e0ca2ab3de26059356193d35c", "shasum": "" }, "require": { @@ -3976,7 +3939,7 @@ "doctrine/annotations": "1.11.1", "doctrine/lexer": "1.2.1", "doctrine/reflection": "1.2.2", - "drupal/core": "9.1.5", + "drupal/core": "9.1.6", "egulias/email-validator": "2.1.22", "guzzlehttp/guzzle": "6.5.5", "guzzlehttp/promises": "1.4.0", @@ -4037,9 +4000,9 @@ ], "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.", "support": { - "source": "https://github.com/drupal/core-recommended/tree/9.1.5" + "source": "https://github.com/drupal/core-recommended/tree/9.1.6" }, - "time": "2021-03-04T14:36:14+00:00" + "time": "2021-04-07T11:18:45+00:00" }, { "name": "drupal/cshs", @@ -4828,17 +4791,17 @@ }, { "name": "drupal/entity_clone", - "version": "1.0.0-beta5", + "version": "1.0.0-beta6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_clone.git", - "reference": "8.x-1.0-beta5" + "reference": "8.x-1.0-beta6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_clone-8.x-1.0-beta5.zip", - "reference": "8.x-1.0-beta5", - "shasum": "5220d23ac01cd13ff7ef48589e9f6438659a8736" + "url": "https://ftp.drupal.org/files/projects/entity_clone-8.x-1.0-beta6.zip", + "reference": "8.x-1.0-beta6", + "shasum": "35d04649b6fb349df761abab37506a94f172981f" }, "require": { "drupal/core": "^8 || ^9" @@ -4846,8 +4809,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0-beta5", - "datestamp": "1615822112", + "version": "8.x-1.0-beta6", + "datestamp": "1617209997", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -5376,20 +5339,21 @@ }, { "name": "drupal/inline_entity_form", - "version": "1.0.0-rc8", + "version": "1.0.0-rc9", "source": { "type": "git", "url": "https://git.drupalcode.org/project/inline_entity_form.git", - "reference": "8.x-1.0-rc8" + "reference": "8.x-1.0-rc9" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/inline_entity_form-8.x-1.0-rc8.zip", - "reference": "8.x-1.0-rc8", - "shasum": "103de382dd07b4acdd6bacd5ad76628fdf0eefda" + "url": "https://ftp.drupal.org/files/projects/inline_entity_form-8.x-1.0-rc9.zip", + "reference": "8.x-1.0-rc9", + "shasum": "78953103a9c6e4e44bc877820a35f39913ea4559" }, "require": { - "drupal/core": "^8.7.7 || ^9" + "drupal/core": "^8.8 || ^9", + "php": ">=7.1" }, "require-dev": { "drupal/entity_reference_revisions": "^1.0" @@ -5397,8 +5361,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0-rc8", - "datestamp": "1602172716", + "version": "8.x-1.0-rc9", + "datestamp": "1618174486", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -7253,17 +7217,17 @@ }, { "name": "drupal/smart_date", - "version": "3.1.1", + "version": "3.1.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/smart_date.git", - "reference": "3.1.1" + "reference": "3.1.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/smart_date-3.1.1.zip", - "reference": "3.1.1", - "shasum": "6dac5a750c7ae56142352eeb384565204118ed18" + "url": "https://ftp.drupal.org/files/projects/smart_date-3.1.2.zip", + "reference": "3.1.2", + "shasum": "bf8efded21b493dd70728f6287419b7b8cef0879" }, "require": { "drupal/core": "^8 || ^9", @@ -7276,8 +7240,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.1.1", - "datestamp": "1612026830", + "version": "3.1.2", + "datestamp": "1618048522", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -8038,16 +8002,16 @@ }, { "name": "drush/drush", - "version": "10.4.0", + "version": "10.4.2", "source": { "type": "git", "url": "https://github.com/drush-ops/drush.git", - "reference": "507cecd32b05850cf2f70c8922ddad247cd9ce10" + "reference": "0d48a046f5511dd8fda10ac3376b97bb65a2b7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drush-ops/drush/zipball/507cecd32b05850cf2f70c8922ddad247cd9ce10", - "reference": "507cecd32b05850cf2f70c8922ddad247cd9ce10", + "url": "https://api.github.com/repos/drush-ops/drush/zipball/0d48a046f5511dd8fda10ac3376b97bb65a2b7ec", + "reference": "0d48a046f5511dd8fda10ac3376b97bb65a2b7ec", "shasum": "" }, "require": { @@ -8083,7 +8047,6 @@ "david-garcia/phpwhois": "4.3.0", "drupal/alinks": "1.0.0", "drupal/core-recommended": "^8.8", - "lox/xhprof": "dev-master", "phpunit/phpunit": ">=7.5.20", "squizlabs/php_codesniffer": "^2.7 || ^3", "vlucas/phpdotenv": "^2.4", @@ -8172,7 +8135,7 @@ "irc": "irc://irc.freenode.org/drush", "issues": "https://github.com/drush-ops/drush/issues", "slack": "https://drupal.slack.com/messages/C62H9CWQM", - "source": "https://github.com/drush-ops/drush/tree/10.4.0" + "source": "https://github.com/drush-ops/drush/tree/10.4.2" }, "funding": [ { @@ -8180,7 +8143,7 @@ "type": "github" } ], - "time": "2021-02-15T20:26:00+00:00" + "time": "2021-04-06T03:37:46+00:00" }, { "name": "egulias/email-validator", @@ -8311,16 +8274,16 @@ }, { "name": "fileeye/mimemap", - "version": "1.1.4", + "version": "1.1.5", "source": { "type": "git", "url": "https://github.com/FileEye/MimeMap.git", - "reference": "3a0ddb71f06d8fb3f84f0a3c45348af81803b16d" + "reference": "9efaad84adce38f2ee49331b2bd684c83fd9aa3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/3a0ddb71f06d8fb3f84f0a3c45348af81803b16d", - "reference": "3a0ddb71f06d8fb3f84f0a3c45348af81803b16d", + "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/9efaad84adce38f2ee49331b2bd684c83fd9aa3b", + "reference": "9efaad84adce38f2ee49331b2bd684c83fd9aa3b", "shasum": "" }, "require": { @@ -8364,9 +8327,9 @@ ], "support": { "issues": "https://github.com/FileEye/MimeMap/issues", - "source": "https://github.com/FileEye/MimeMap/tree/master" + "source": "https://github.com/FileEye/MimeMap/tree/1.1.5" }, - "time": "2020-05-16T10:19:16+00:00" + "time": "2021-04-02T20:21:45+00:00" }, { "name": "grasmash/expander", @@ -9582,16 +9545,16 @@ }, { "name": "phpmailer/phpmailer", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "4a08cf4cdd2c38d12ee2b9fa69e5d235f37a6dcb" + "reference": "050d430203105c27c30efd1dce7aa421ad882d01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/4a08cf4cdd2c38d12ee2b9fa69e5d235f37a6dcb", - "reference": "4a08cf4cdd2c38d12ee2b9fa69e5d235f37a6dcb", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/050d430203105c27c30efd1dce7aa421ad882d01", + "reference": "050d430203105c27c30efd1dce7aa421ad882d01", "shasum": "" }, "require": { @@ -9609,7 +9572,7 @@ "yoast/phpunit-polyfills": "^0.2.0" }, "suggest": { - "ext-mbstring": "Needed to send email in multibyte encoding charset", + "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses", "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication", "league/oauth2-google": "Needed for Google XOAUTH2 authentication", "psr/log": "For optional PSR-3 debug logging", @@ -9646,7 +9609,7 @@ "description": "PHPMailer is a full-featured email creation and transfer class for PHP", "support": { "issues": "https://github.com/PHPMailer/PHPMailer/issues", - "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.3.0" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.4.0" }, "funding": [ { @@ -9654,7 +9617,7 @@ "type": "github" } ], - "time": "2021-02-19T15:28:08+00:00" + "time": "2021-03-31T20:06:42+00:00" }, { "name": "psr/container", @@ -9869,20 +9832,19 @@ }, { "name": "psy/psysh", - "version": "v0.10.7", + "version": "v0.10.8", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "a395af46999a12006213c0c8346c9445eb31640c" + "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a395af46999a12006213c0c8346c9445eb31640c", - "reference": "a395af46999a12006213c0c8346c9445eb31640c", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e4573f47750dd6c92dca5aee543fa77513cbd8d3", + "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3", "shasum": "" }, "require": { - "dnoegel/php-xdg-base-dir": "0.1.*", "ext-json": "*", "ext-tokenizer": "*", "nikic/php-parser": "~4.0|~3.0|~2.0|~1.3", @@ -9939,9 +9901,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.10.7" + "source": "https://github.com/bobthecow/psysh/tree/v0.10.8" }, - "time": "2021-03-14T02:14:56+00:00" + "time": "2021-04-10T16:23:39+00:00" }, { "name": "ralouphie/getallheaders", @@ -9989,16 +9951,16 @@ }, { "name": "simshaun/recurr", - "version": "v4.0.2", + "version": "v4.0.5", "source": { "type": "git", "url": "https://github.com/simshaun/recurr.git", - "reference": "d6f85ec8652366f45f6d1ba07292c9653939631a" + "reference": "08b0b46879f598cd11dd42b4c1a9c221a0562749" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simshaun/recurr/zipball/d6f85ec8652366f45f6d1ba07292c9653939631a", - "reference": "d6f85ec8652366f45f6d1ba07292c9653939631a", + "url": "https://api.github.com/repos/simshaun/recurr/zipball/08b0b46879f598cd11dd42b4c1a9c221a0562749", + "reference": "08b0b46879f598cd11dd42b4c1a9c221a0562749", "shasum": "" }, "require": { @@ -10006,7 +9968,7 @@ "php": ">=5.5.0" }, "require-dev": { - "phpunit/phpunit": "~4.5" + "phpunit/phpunit": "~5.7" }, "type": "library", "extra": { @@ -10041,9 +10003,9 @@ ], "support": { "issues": "https://github.com/simshaun/recurr/issues", - "source": "https://github.com/simshaun/recurr/tree/v4.0.2" + "source": "https://github.com/simshaun/recurr/tree/v4.0.5" }, - "time": "2019-11-18T17:48:08+00:00" + "time": "2021-03-25T23:00:49+00:00" }, { "name": "stack/builder", @@ -10901,16 +10863,16 @@ }, { "name": "symfony/filesystem", - "version": "v4.4.20", + "version": "v4.4.21", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "715e7a531bdae109a828f9e91629e5b3b2926beb" + "reference": "940826c465be2690c9fae91b2793481e5cbd6834" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/715e7a531bdae109a828f9e91629e5b3b2926beb", - "reference": "715e7a531bdae109a828f9e91629e5b3b2926beb", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/940826c465be2690c9fae91b2793481e5cbd6834", + "reference": "940826c465be2690c9fae91b2793481e5cbd6834", "shasum": "" }, "require": { @@ -10943,7 +10905,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v4.4.20" + "source": "https://github.com/symfony/filesystem/tree/v4.4.21" }, "funding": [ { @@ -10959,7 +10921,7 @@ "type": "tidelift" } ], - "time": "2021-02-11T19:34:41+00:00" + "time": "2021-03-28T09:59:32+00:00" }, { "name": "symfony/finder",