Merge 8.9.10, resolve merge conflicts, and update lockfile. (2fc7a92f) · Commits · project / drupal

composer.lock

+138 −7

Original line number	Diff line number	Diff line
		@@ -56,6 +56,10 @@
		"cors",
		"stack"
		],
		"support": {
		"issues": "https://github.com/asm89/stack-cors/issues",
		"source": "https://github.com/asm89/stack-cors/tree/1.3.0"
		},
		"time": "2019-12-24T22:41:47+00:00"
		},
		{
		@@ -671,7 +675,7 @@
		"dist": {
		"type": "path",
		"url": "core",
		"reference": "9e58f98953ff193220b4366d62446dc984f346d4"
		"reference": "b8032243fdd141c94315906fc8e9c34222d94e93"
		},
		"require": {
		"asm89/stack-cors": "^1.1",
		@@ -697,7 +701,7 @@
		"laminas/laminas-diactoros": "^1.8",
		"laminas/laminas-feed": "^2.12",
		"masterminds/html5": "^2.1",
		"pear/archive_tar": "^1.4.9",
		"pear/archive_tar": "^1.4.11",
		"php": "^7.0.8",
		"psr/log": "^1.0",
		"stack/builder": "^1.0",
		@@ -1565,6 +1569,12 @@
		"laminas",
		"zf"
		],
		"funding": [
		{
		"url": "https://funding.communitybridge.org/projects/laminas-project",
		"type": "community_bridge"
		}
		],
		"time": "2020-05-20T16:45:56+00:00"
		},
		{
		@@ -1679,16 +1689,16 @@
		},
		{
		"name": "pear/archive_tar",
		"version": "1.4.9",
		"version": "1.4.11",
		"source": {
		"type": "git",
		"url": "https://github.com/pear/Archive_Tar.git",
		"reference": "c5b00053770e1d72128252c62c2c1a12c26639f0"
		"reference": "17d355cb7d3c4ff08e5729f29cd7660145208d9d"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/pear/Archive_Tar/zipball/c5b00053770e1d72128252c62c2c1a12c26639f0",
		"reference": "c5b00053770e1d72128252c62c2c1a12c26639f0",
		"url": "https://api.github.com/repos/pear/Archive_Tar/zipball/17d355cb7d3c4ff08e5729f29cd7660145208d9d",
		"reference": "17d355cb7d3c4ff08e5729f29cd7660145208d9d",
		"shasum": ""
		},
		"require": {
		@@ -1741,7 +1751,11 @@
		"archive",
		"tar"
		],
		"time": "2019-12-04T10:17:28+00:00"
		"support": {
		"issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Archive_Tar",
		"source": "https://github.com/pear/Archive_Tar"
		},
		"time": "2020-11-19T22:10:24+00:00"
		},
		{
		"name": "pear/console_getopt",
		@@ -1788,6 +1802,10 @@
		}
		],
		"description": "More info available on: http://pear.php.net/package/Console_Getopt",
		"support": {
		"issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Console_Getopt",
		"source": "https://github.com/pear/Console_Getopt"
		},
		"time": "2019-11-20T18:27:48+00:00"
		},
		{
		@@ -1832,6 +1850,10 @@
		}
		],
		"description": "Minimal set of PEAR core files to be used as composer dependency",
		"support": {
		"issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR",
		"source": "https://github.com/pear/pear-core-minimal"
		},
		"time": "2019-11-19T19:00:24+00:00"
		},
		{
		@@ -1887,6 +1909,10 @@
		"keywords": [
		"exception"
		],
		"support": {
		"issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR_Exception",
		"source": "https://github.com/pear/PEAR_Exception"
		},
		"time": "2019-12-10T10:24:42+00:00"
		},
		{
		@@ -1936,6 +1962,10 @@
		"container-interop",
		"psr"
		],
		"support": {
		"issues": "https://github.com/php-fig/container/issues",
		"source": "https://github.com/php-fig/container/tree/master"
		},
		"time": "2017-02-14T16:28:37+00:00"
		},
		{
		@@ -1986,6 +2016,9 @@
		"request",
		"response"
		],
		"support": {
		"source": "https://github.com/php-fig/http-message/tree/master"
		},
		"time": "2016-08-06T14:39:51+00:00"
		},
		{
		@@ -2033,6 +2066,9 @@
		"psr",
		"psr-3"
		],
		"support": {
		"source": "https://github.com/php-fig/log/tree/1.1.3"
		},
		"time": "2020-03-23T09:12:05+00:00"
		},
		{
		@@ -2073,6 +2109,10 @@
		}
		],
		"description": "A polyfill for getallheaders.",
		"support": {
		"issues": "https://github.com/ralouphie/getallheaders/issues",
		"source": "https://github.com/ralouphie/getallheaders/tree/develop"
		},
		"time": "2019-03-08T08:55:37+00:00"
		},
		{
		@@ -3233,6 +3273,20 @@
		"portable",
		"shim"
		],
		"funding": [
		{
		"url": "https://symfony.com/sponsor",
		"type": "custom"
		},
		{
		"url": "https://github.com/fabpot",
		"type": "github"
		},
		{
		"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
		"type": "tidelift"
		}
		],
		"time": "2020-05-12T16:47:27+00:00"
		},
		{
		@@ -4042,6 +4096,10 @@
		"testing",
		"web"
		],
		"support": {
		"issues": "https://github.com/minkphp/Mink/issues",
		"source": "https://github.com/minkphp/Mink/tree/v1.8.1"
		},
		"time": "2020-03-11T15:45:53+00:00"
		},
		{
		@@ -4099,6 +4157,10 @@
		"browser",
		"testing"
		],
		"support": {
		"issues": "https://github.com/minkphp/MinkBrowserKitDriver/issues",
		"source": "https://github.com/minkphp/MinkBrowserKitDriver/tree/v1.3.4"
		},
		"time": "2020-03-11T09:49:45+00:00"
		},
		{
		@@ -4154,6 +4216,10 @@
		"headless",
		"testing"
		],
		"support": {
		"issues": "https://github.com/minkphp/MinkGoutteDriver/issues",
		"source": "https://github.com/minkphp/MinkGoutteDriver/tree/master"
		},
		"time": "2016-03-05T09:04:22+00:00"
		},
		{
		@@ -4215,6 +4281,10 @@
		"testing",
		"webdriver"
		],
		"support": {
		"issues": "https://github.com/minkphp/MinkSelenium2Driver/issues",
		"source": "https://github.com/minkphp/MinkSelenium2Driver/tree/v1.4.0"
		},
		"time": "2020-03-11T14:43:21+00:00"
		},
		{
		@@ -4271,6 +4341,16 @@
		"ssl",
		"tls"
		],
		"funding": [
		{
		"url": "https://packagist.com",
		"type": "custom"
		},
		{
		"url": "https://tidelift.com/funding/github/packagist/composer/composer",
		"type": "tidelift"
		}
		],
		"time": "2020-04-08T08:27:21+00:00"
		},
		{
		@@ -4675,6 +4755,10 @@
		"webdriver",
		"webtest"
		],
		"support": {
		"issues": "https://github.com/instaclick/php-webdriver/issues",
		"source": "https://github.com/instaclick/php-webdriver/tree/1.x"
		},
		"time": "2019-09-25T09:05:11+00:00"
		},
		{
		@@ -4856,6 +4940,10 @@
		"json",
		"schema"
		],
		"support": {
		"issues": "https://github.com/justinrainbow/json-schema/issues",
		"source": "https://github.com/justinrainbow/json-schema/tree/5.2.10"
		},
		"time": "2020-05-27T16:41:55+00:00"
		},
		{
		@@ -4902,6 +4990,11 @@
		],
		"description": "Virtual file system to mock the real file system in unit tests.",
		"homepage": "http://vfs.bovigo.org/",
		"support": {
		"issues": "https://github.com/bovigo/vfsStream/issues",
		"source": "https://github.com/bovigo/vfsStream/tree/master",
		"wiki": "https://github.com/bovigo/vfsStream/wiki"
		},
		"time": "2019-10-30T15:31:00+00:00"
		},
		{
		@@ -5414,6 +5507,10 @@
		"keywords": [
		"template"
		],
		"support": {
		"issues": "https://github.com/sebastianbergmann/php-text-template/issues",
		"source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
		},
		"time": "2015-06-21T13:50:34+00:00"
		},
		{
		@@ -5702,6 +5799,10 @@
		],
		"description": "Looks up which function or method a line of code belongs to",
		"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
		"support": {
		"issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
		"source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/master"
		},
		"time": "2017-03-04T06:30:41+00:00"
		},
		{
		@@ -5935,6 +6036,10 @@
		"export",
		"exporter"
		],
		"support": {
		"issues": "https://github.com/sebastianbergmann/exporter/issues",
		"source": "https://github.com/sebastianbergmann/exporter/tree/master"
		},
		"time": "2019-09-14T09:02:43+00:00"
		},
		{
		@@ -6033,6 +6138,10 @@
		],
		"description": "Traverses array structures and object graphs to enumerate all referenced objects",
		"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
		"support": {
		"issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
		"source": "https://github.com/sebastianbergmann/object-enumerator/tree/master"
		},
		"time": "2017-08-03T12:35:26+00:00"
		},
		{
		@@ -6078,6 +6187,10 @@
		],
		"description": "Allows reflection of object attributes, including inherited and non-public ones",
		"homepage": "https://github.com/sebastianbergmann/object-reflector/",
		"support": {
		"issues": "https://github.com/sebastianbergmann/object-reflector/issues",
		"source": "https://github.com/sebastianbergmann/object-reflector/tree/master"
		},
		"time": "2017-03-29T09:07:27+00:00"
		},
		{
		@@ -6131,6 +6244,10 @@
		],
		"description": "Provides functionality to recursively process PHP variables",
		"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
		"support": {
		"issues": "https://github.com/sebastianbergmann/recursion-context/issues",
		"source": "https://github.com/sebastianbergmann/recursion-context/tree/master"
		},
		"time": "2017-03-03T06:23:57+00:00"
		},
		{
		@@ -6216,6 +6333,10 @@
		],
		"description": "Library that helps with managing the version number of Git-hosted PHP projects",
		"homepage": "https://github.com/sebastianbergmann/version",
		"support": {
		"issues": "https://github.com/sebastianbergmann/version/issues",
		"source": "https://github.com/sebastianbergmann/version/tree/master"
		},
		"time": "2016-10-03T07:35:21+00:00"
		},
		{
		@@ -6265,6 +6386,16 @@
		"parser",
		"validator"
		],
		"funding": [
		{
		"url": "https://github.com/Seldaek",
		"type": "github"
		},
		{
		"url": "https://tidelift.com/funding/github/packagist/seld/jsonlint",
		"type": "tidelift"
		}
		],
		"time": "2020-04-30T19:05:18+00:00"
		},
		{

composer/Metapackage/CoreRecommended/composer.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		"laminas/laminas-zendframework-bridge": "1.0.4",
		"masterminds/html5": "2.3.0",
		"paragonie/random_compat": "v9.99.99",
		"pear/archive_tar": "1.4.9",
		"pear/archive_tar": "1.4.11",
		"pear/console_getopt": "v1.4.3",
		"pear/pear-core-minimal": "v1.10.10",
		"pear/pear_exception": "v1.0.1",

core/composer.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@
		"laminas/laminas-diactoros": "^1.8",
		"composer/semver": "^1.0",
		"asm89/stack-cors": "^1.1",
		"pear/archive_tar": "^1.4.9",
		"pear/archive_tar": "^1.4.11",
		"psr/log": "^1.0"
		},
		"conflict": {

core/lib/Drupal.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ class Drupal {
		/**
		* The current system version.
		*/
		const VERSION = '8.9.10-dev';
		const VERSION = '8.9.11-dev';

		/**
		* Core API compatibility.