From c28eea09b12bfb3dac9268a1e295954bb823bcb3 Mon Sep 17 00:00:00 2001
From: Brian Canini <canini.16@osu.edu>
Date: Thu, 22 Jul 2021 11:14:12 -0400
Subject: [PATCH] Upgrading drupal/core (9.2.1 => 9.2.2)
---
composer.lock | 40 +--
vendor/composer/InstalledVersions.php | 246 +++++++++---------
vendor/composer/include_paths.php | 2 +-
vendor/composer/installed.json | 46 ++--
vendor/composer/installed.php | 246 +++++++++---------
vendor/pear/archive_tar/Archive/Tar.php | 50 ++--
vendor/pear/archive_tar/package.xml | 23 +-
.../archive_tar/tests/relativesymlink.phpt | 6 +-
web/core/PATCHES.txt | 4 -
web/core/composer.json | 2 +-
web/core/lib/Drupal.php | 2 +-
.../user/src/UserAccessControlHandler.php | 3 -
.../modules/user/user.permissions.yml.rej | 17 --
13 files changed, 344 insertions(+), 343 deletions(-)
delete mode 100644 web/core/modules/user/user.permissions.yml.rej
diff --git a/composer.lock b/composer.lock
index d41a3e1166..3e95766fd6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2955,16 +2955,16 @@
},
{
"name": "drupal/core",
- "version": "9.2.1",
+ "version": "9.2.2",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
- "reference": "20eb99aa59a265d22a21a4d6fde70901c3b5a37c"
+ "reference": "08ad826a9ccd193e9a2e717f75c9f6fac3274a79"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core/zipball/20eb99aa59a265d22a21a4d6fde70901c3b5a37c",
- "reference": "20eb99aa59a265d22a21a4d6fde70901c3b5a37c",
+ "url": "https://api.github.com/repos/drupal/core/zipball/08ad826a9ccd193e9a2e717f75c9f6fac3274a79",
+ "reference": "08ad826a9ccd193e9a2e717f75c9f6fac3274a79",
"shasum": ""
},
"require": {
@@ -2990,7 +2990,7 @@
"laminas/laminas-diactoros": "^2.1",
"laminas/laminas-feed": "^2.12",
"masterminds/html5": "^2.1",
- "pear/archive_tar": "^1.4.12",
+ "pear/archive_tar": "^1.4.14",
"php": ">=7.3.0",
"psr/log": "^1.0",
"stack/builder": "^1.0",
@@ -3203,9 +3203,9 @@
],
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
"support": {
- "source": "https://github.com/drupal/core/tree/9.2.1"
+ "source": "https://github.com/drupal/core/tree/9.2.2"
},
- "time": "2021-07-07T13:04:41+00:00"
+ "time": "2021-07-20T21:42:48+00:00"
},
{
"name": "drupal/core-composer-scaffold",
@@ -3259,16 +3259,16 @@
},
{
"name": "drupal/core-recommended",
- "version": "9.2.1",
+ "version": "9.2.2",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-recommended.git",
- "reference": "f043a94e9a8aa60016974d60648508258a51bf86"
+ "reference": "06a84abc067304e9280fde292a382ca6bce82ee1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core-recommended/zipball/f043a94e9a8aa60016974d60648508258a51bf86",
- "reference": "f043a94e9a8aa60016974d60648508258a51bf86",
+ "url": "https://api.github.com/repos/drupal/core-recommended/zipball/06a84abc067304e9280fde292a382ca6bce82ee1",
+ "reference": "06a84abc067304e9280fde292a382ca6bce82ee1",
"shasum": ""
},
"require": {
@@ -3277,7 +3277,7 @@
"doctrine/annotations": "1.13.1",
"doctrine/lexer": "1.2.1",
"doctrine/reflection": "1.2.2",
- "drupal/core": "9.2.1",
+ "drupal/core": "9.2.2",
"egulias/email-validator": "2.1.25",
"guzzlehttp/guzzle": "6.5.5",
"guzzlehttp/promises": "1.4.1",
@@ -3288,7 +3288,7 @@
"laminas/laminas-stdlib": "3.3.1",
"laminas/laminas-zendframework-bridge": "1.2.0",
"masterminds/html5": "2.7.4",
- "pear/archive_tar": "1.4.13",
+ "pear/archive_tar": "1.4.14",
"pear/console_getopt": "v1.4.3",
"pear/pear-core-minimal": "v1.10.10",
"pear/pear_exception": "v1.0.2",
@@ -3340,9 +3340,9 @@
],
"description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
"support": {
- "source": "https://github.com/drupal/core-recommended/tree/9.2.1"
+ "source": "https://github.com/drupal/core-recommended/tree/9.2.2"
},
- "time": "2021-07-07T13:04:41+00:00"
+ "time": "2021-07-20T21:42:48+00:00"
},
{
"name": "drupal/crop",
@@ -9576,16 +9576,16 @@
},
{
"name": "pear/archive_tar",
- "version": "1.4.13",
+ "version": "1.4.14",
"source": {
"type": "git",
"url": "https://github.com/pear/Archive_Tar.git",
- "reference": "2b87b41178cc6d4ad3cba678a46a1cae49786011"
+ "reference": "4d761c5334c790e45ef3245f0864b8955c562caa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/2b87b41178cc6d4ad3cba678a46a1cae49786011",
- "reference": "2b87b41178cc6d4ad3cba678a46a1cae49786011",
+ "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/4d761c5334c790e45ef3245f0864b8955c562caa",
+ "reference": "4d761c5334c790e45ef3245f0864b8955c562caa",
"shasum": ""
},
"require": {
@@ -9652,7 +9652,7 @@
"type": "patreon"
}
],
- "time": "2021-02-16T10:50:50+00:00"
+ "time": "2021-07-20T13:53:39+00:00"
},
{
"name": "pear/console_getopt",
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index 106320e872..01a9aa605c 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -30,7 +30,7 @@ class InstalledVersions
'aliases' =>
array (
),
- 'reference' => '80e38d6f6c7ba9c774006b7c720d487268fea764',
+ 'reference' => 'f720046f0ea7cc87f5d356988ae7fbf9885955d7',
'name' => 'osu-asc-webservices/d8-upstream',
),
'versions' =>
@@ -298,7 +298,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/addtocalendar' =>
@@ -332,7 +332,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/allowed_formats' =>
@@ -357,28 +357,28 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/ban' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/bartik' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/basic_auth' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/better_exposed_filters' =>
@@ -394,21 +394,21 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/block' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/block_content' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/block_field' =>
@@ -442,7 +442,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/bootstrap' =>
@@ -458,7 +458,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/cache_control_override' =>
@@ -483,7 +483,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/ckeditor_indentblock' =>
@@ -499,35 +499,35 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/classy' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/color' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/comment' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/config' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/config_direct_save' =>
@@ -561,7 +561,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/config_update' =>
@@ -613,7 +613,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/content_access' =>
@@ -629,58 +629,58 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/content_translation' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/contextual' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core' =>
array (
- 'pretty_version' => '9.2.1',
- 'version' => '9.2.1.0',
+ 'pretty_version' => '9.2.2',
+ 'version' => '9.2.2.0',
'aliases' =>
array (
),
- 'reference' => '20eb99aa59a265d22a21a4d6fde70901c3b5a37c',
+ 'reference' => '08ad826a9ccd193e9a2e717f75c9f6fac3274a79',
),
'drupal/core-annotation' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-assertion' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-bridge' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-class-finder' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-composer-scaffold' =>
@@ -696,156 +696,156 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-dependency-injection' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-diff' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-discovery' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-event-dispatcher' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-file-cache' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-file-security' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-filesystem' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-front-matter' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-gettext' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-graph' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-http-foundation' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-php-storage' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-plugin' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-proxy-builder' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-recommended' =>
array (
- 'pretty_version' => '9.2.1',
- 'version' => '9.2.1.0',
+ 'pretty_version' => '9.2.2',
+ 'version' => '9.2.2.0',
'aliases' =>
array (
),
- 'reference' => 'f043a94e9a8aa60016974d60648508258a51bf86',
+ 'reference' => '06a84abc067304e9280fde292a382ca6bce82ee1',
),
'drupal/core-render' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-serialization' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-transliteration' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-utility' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-uuid' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-version' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/crop' =>
@@ -870,21 +870,21 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/datetime_range' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/dblog' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/dropzonejs' =>
@@ -909,14 +909,14 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/editor' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/editor_advanced_link' =>
@@ -986,7 +986,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/entity_reference_revisions' =>
@@ -1011,7 +1011,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/field_group' =>
@@ -1027,7 +1027,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/field_permissions' =>
@@ -1043,14 +1043,14 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/file' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/file_browser' =>
@@ -1066,7 +1066,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/focal_point' =>
@@ -1082,7 +1082,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/google_analytics' =>
@@ -1107,28 +1107,28 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/help' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/help_topics' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/history' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/honeypot' =>
@@ -1144,7 +1144,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/inline_entity_form' =>
@@ -1160,7 +1160,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/jquery_ui' =>
@@ -1203,28 +1203,28 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/language' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/layout_builder' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/layout_discovery' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/libraries' =>
@@ -1240,7 +1240,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/link_attributes' =>
@@ -1265,7 +1265,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/mathjax' =>
@@ -1281,7 +1281,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/media_entity_browser' =>
@@ -1306,7 +1306,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/menu_block' =>
@@ -1340,14 +1340,14 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/menu_ui' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/metatag' =>
@@ -1363,7 +1363,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/migrate_devel' =>
@@ -1379,21 +1379,21 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/migrate_drupal_multilingual' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/migrate_drupal_ui' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/migrate_plus' =>
@@ -1418,7 +1418,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/mobile_detect' =>
@@ -1461,28 +1461,28 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/olivero' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/options' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/page_cache' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/pantheon_advanced_page_cache' =>
@@ -1507,14 +1507,14 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/path_alias' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/pathauto' =>
@@ -1530,14 +1530,14 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/rdf' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/rebuild_cache_access' =>
@@ -1580,14 +1580,14 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/rest' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/roleassign' =>
@@ -1612,7 +1612,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/search_api' =>
@@ -1637,28 +1637,28 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/settings_tray' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/seven' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/shortcut' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/simple_gmap' =>
@@ -1728,21 +1728,21 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/stark' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/statistics' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/superfish' =>
@@ -1767,35 +1767,35 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/system' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/taxonomy' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/telephone' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/text' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/token' =>
@@ -1811,21 +1811,21 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/tour' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/tracker' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/twig_tweak' =>
@@ -1850,14 +1850,14 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/user' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/userprotect' =>
@@ -1891,7 +1891,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/views_ajax_history' =>
@@ -1952,7 +1952,7 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/webform' =>
@@ -1968,14 +1968,14 @@ class InstalledVersions
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/workspaces' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drush-ops/behat-drush-endpoint' =>
@@ -2226,7 +2226,7 @@ class InstalledVersions
'aliases' =>
array (
),
- 'reference' => '80e38d6f6c7ba9c774006b7c720d487268fea764',
+ 'reference' => 'f720046f0ea7cc87f5d356988ae7fbf9885955d7',
),
'pantheon-systems/quicksilver-pushback' =>
array (
@@ -2239,12 +2239,12 @@ class InstalledVersions
),
'pear/archive_tar' =>
array (
- 'pretty_version' => '1.4.13',
- 'version' => '1.4.13.0',
+ 'pretty_version' => '1.4.14',
+ 'version' => '1.4.14.0',
'aliases' =>
array (
),
- 'reference' => '2b87b41178cc6d4ad3cba678a46a1cae49786011',
+ 'reference' => '4d761c5334c790e45ef3245f0864b8955c562caa',
),
'pear/console_getopt' =>
array (
diff --git a/vendor/composer/include_paths.php b/vendor/composer/include_paths.php
index d4fb967181..507c1ade7e 100644
--- a/vendor/composer/include_paths.php
+++ b/vendor/composer/include_paths.php
@@ -6,8 +6,8 @@
$baseDir = dirname($vendorDir);
return array(
- $vendorDir . '/pear/archive_tar',
$vendorDir . '/pear/console_getopt',
$vendorDir . '/pear/pear-core-minimal/src',
$vendorDir . '/pear/pear_exception',
+ $vendorDir . '/pear/archive_tar',
);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 4385e614d8..803029fb60 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -3036,17 +3036,17 @@
},
{
"name": "drupal/core",
- "version": "9.2.1",
- "version_normalized": "9.2.1.0",
+ "version": "9.2.2",
+ "version_normalized": "9.2.2.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
- "reference": "20eb99aa59a265d22a21a4d6fde70901c3b5a37c"
+ "reference": "08ad826a9ccd193e9a2e717f75c9f6fac3274a79"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core/zipball/20eb99aa59a265d22a21a4d6fde70901c3b5a37c",
- "reference": "20eb99aa59a265d22a21a4d6fde70901c3b5a37c",
+ "url": "https://api.github.com/repos/drupal/core/zipball/08ad826a9ccd193e9a2e717f75c9f6fac3274a79",
+ "reference": "08ad826a9ccd193e9a2e717f75c9f6fac3274a79",
"shasum": ""
},
"require": {
@@ -3072,7 +3072,7 @@
"laminas/laminas-diactoros": "^2.1",
"laminas/laminas-feed": "^2.12",
"masterminds/html5": "^2.1",
- "pear/archive_tar": "^1.4.12",
+ "pear/archive_tar": "^1.4.14",
"php": ">=7.3.0",
"psr/log": "^1.0",
"stack/builder": "^1.0",
@@ -3211,7 +3211,7 @@
"drupal/workflows": "self.version",
"drupal/workspaces": "self.version"
},
- "time": "2021-07-07T13:04:41+00:00",
+ "time": "2021-07-20T21:42:48+00:00",
"type": "drupal-core",
"extra": {
"drupal-scaffold": {
@@ -3291,7 +3291,7 @@
],
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
"support": {
- "source": "https://github.com/drupal/core/tree/9.2.1"
+ "source": "https://github.com/drupal/core/tree/9.2.2"
},
"install-path": "../../web/core"
},
@@ -3347,17 +3347,17 @@
},
{
"name": "drupal/core-recommended",
- "version": "9.2.1",
- "version_normalized": "9.2.1.0",
+ "version": "9.2.2",
+ "version_normalized": "9.2.2.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-recommended.git",
- "reference": "f043a94e9a8aa60016974d60648508258a51bf86"
+ "reference": "06a84abc067304e9280fde292a382ca6bce82ee1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core-recommended/zipball/f043a94e9a8aa60016974d60648508258a51bf86",
- "reference": "f043a94e9a8aa60016974d60648508258a51bf86",
+ "url": "https://api.github.com/repos/drupal/core-recommended/zipball/06a84abc067304e9280fde292a382ca6bce82ee1",
+ "reference": "06a84abc067304e9280fde292a382ca6bce82ee1",
"shasum": ""
},
"require": {
@@ -3366,7 +3366,7 @@
"doctrine/annotations": "1.13.1",
"doctrine/lexer": "1.2.1",
"doctrine/reflection": "1.2.2",
- "drupal/core": "9.2.1",
+ "drupal/core": "9.2.2",
"egulias/email-validator": "2.1.25",
"guzzlehttp/guzzle": "6.5.5",
"guzzlehttp/promises": "1.4.1",
@@ -3377,7 +3377,7 @@
"laminas/laminas-stdlib": "3.3.1",
"laminas/laminas-zendframework-bridge": "1.2.0",
"masterminds/html5": "2.7.4",
- "pear/archive_tar": "1.4.13",
+ "pear/archive_tar": "1.4.14",
"pear/console_getopt": "v1.4.3",
"pear/pear-core-minimal": "v1.10.10",
"pear/pear_exception": "v1.0.2",
@@ -3422,7 +3422,7 @@
"conflict": {
"webflo/drupal-core-strict": "*"
},
- "time": "2021-07-07T13:04:41+00:00",
+ "time": "2021-07-20T21:42:48+00:00",
"type": "metapackage",
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -3430,7 +3430,7 @@
],
"description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
"support": {
- "source": "https://github.com/drupal/core-recommended/tree/9.2.1"
+ "source": "https://github.com/drupal/core-recommended/tree/9.2.2"
},
"install-path": null
},
@@ -9941,17 +9941,17 @@
},
{
"name": "pear/archive_tar",
- "version": "1.4.13",
- "version_normalized": "1.4.13.0",
+ "version": "1.4.14",
+ "version_normalized": "1.4.14.0",
"source": {
"type": "git",
"url": "https://github.com/pear/Archive_Tar.git",
- "reference": "2b87b41178cc6d4ad3cba678a46a1cae49786011"
+ "reference": "4d761c5334c790e45ef3245f0864b8955c562caa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/2b87b41178cc6d4ad3cba678a46a1cae49786011",
- "reference": "2b87b41178cc6d4ad3cba678a46a1cae49786011",
+ "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/4d761c5334c790e45ef3245f0864b8955c562caa",
+ "reference": "4d761c5334c790e45ef3245f0864b8955c562caa",
"shasum": ""
},
"require": {
@@ -9966,7 +9966,7 @@
"ext-xz": "Lzma2 compression support.",
"ext-zlib": "Gzip compression support."
},
- "time": "2021-02-16T10:50:50+00:00",
+ "time": "2021-07-20T13:53:39+00:00",
"type": "library",
"extra": {
"branch-alias": {
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 0d7003b4a3..5f75ef63c3 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -6,7 +6,7 @@
'aliases' =>
array (
),
- 'reference' => '80e38d6f6c7ba9c774006b7c720d487268fea764',
+ 'reference' => 'f720046f0ea7cc87f5d356988ae7fbf9885955d7',
'name' => 'osu-asc-webservices/d8-upstream',
),
'versions' =>
@@ -274,7 +274,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/addtocalendar' =>
@@ -308,7 +308,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/allowed_formats' =>
@@ -333,28 +333,28 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/ban' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/bartik' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/basic_auth' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/better_exposed_filters' =>
@@ -370,21 +370,21 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/block' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/block_content' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/block_field' =>
@@ -418,7 +418,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/bootstrap' =>
@@ -434,7 +434,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/cache_control_override' =>
@@ -459,7 +459,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/ckeditor_indentblock' =>
@@ -475,35 +475,35 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/classy' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/color' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/comment' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/config' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/config_direct_save' =>
@@ -537,7 +537,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/config_update' =>
@@ -589,7 +589,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/content_access' =>
@@ -605,58 +605,58 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/content_translation' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/contextual' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core' =>
array (
- 'pretty_version' => '9.2.1',
- 'version' => '9.2.1.0',
+ 'pretty_version' => '9.2.2',
+ 'version' => '9.2.2.0',
'aliases' =>
array (
),
- 'reference' => '20eb99aa59a265d22a21a4d6fde70901c3b5a37c',
+ 'reference' => '08ad826a9ccd193e9a2e717f75c9f6fac3274a79',
),
'drupal/core-annotation' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-assertion' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-bridge' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-class-finder' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-composer-scaffold' =>
@@ -672,156 +672,156 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-dependency-injection' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-diff' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-discovery' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-event-dispatcher' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-file-cache' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-file-security' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-filesystem' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-front-matter' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-gettext' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-graph' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-http-foundation' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-php-storage' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-plugin' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-proxy-builder' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-recommended' =>
array (
- 'pretty_version' => '9.2.1',
- 'version' => '9.2.1.0',
+ 'pretty_version' => '9.2.2',
+ 'version' => '9.2.2.0',
'aliases' =>
array (
),
- 'reference' => 'f043a94e9a8aa60016974d60648508258a51bf86',
+ 'reference' => '06a84abc067304e9280fde292a382ca6bce82ee1',
),
'drupal/core-render' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-serialization' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-transliteration' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-utility' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-uuid' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/core-version' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/crop' =>
@@ -846,21 +846,21 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/datetime_range' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/dblog' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/dropzonejs' =>
@@ -885,14 +885,14 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/editor' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/editor_advanced_link' =>
@@ -962,7 +962,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/entity_reference_revisions' =>
@@ -987,7 +987,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/field_group' =>
@@ -1003,7 +1003,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/field_permissions' =>
@@ -1019,14 +1019,14 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/file' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/file_browser' =>
@@ -1042,7 +1042,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/focal_point' =>
@@ -1058,7 +1058,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/google_analytics' =>
@@ -1083,28 +1083,28 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/help' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/help_topics' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/history' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/honeypot' =>
@@ -1120,7 +1120,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/inline_entity_form' =>
@@ -1136,7 +1136,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/jquery_ui' =>
@@ -1179,28 +1179,28 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/language' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/layout_builder' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/layout_discovery' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/libraries' =>
@@ -1216,7 +1216,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/link_attributes' =>
@@ -1241,7 +1241,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/mathjax' =>
@@ -1257,7 +1257,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/media_entity_browser' =>
@@ -1282,7 +1282,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/menu_block' =>
@@ -1316,14 +1316,14 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/menu_ui' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/metatag' =>
@@ -1339,7 +1339,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/migrate_devel' =>
@@ -1355,21 +1355,21 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/migrate_drupal_multilingual' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/migrate_drupal_ui' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/migrate_plus' =>
@@ -1394,7 +1394,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/mobile_detect' =>
@@ -1437,28 +1437,28 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/olivero' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/options' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/page_cache' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/pantheon_advanced_page_cache' =>
@@ -1483,14 +1483,14 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/path_alias' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/pathauto' =>
@@ -1506,14 +1506,14 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/rdf' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/rebuild_cache_access' =>
@@ -1556,14 +1556,14 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/rest' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/roleassign' =>
@@ -1588,7 +1588,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/search_api' =>
@@ -1613,28 +1613,28 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/settings_tray' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/seven' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/shortcut' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/simple_gmap' =>
@@ -1704,21 +1704,21 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/stark' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/statistics' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/superfish' =>
@@ -1743,35 +1743,35 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/system' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/taxonomy' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/telephone' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/text' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/token' =>
@@ -1787,21 +1787,21 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/tour' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/tracker' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/twig_tweak' =>
@@ -1826,14 +1826,14 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/user' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/userprotect' =>
@@ -1867,7 +1867,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/views_ajax_history' =>
@@ -1928,7 +1928,7 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/webform' =>
@@ -1944,14 +1944,14 @@
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drupal/workspaces' =>
array (
'replaced' =>
array (
- 0 => '9.2.1',
+ 0 => '9.2.2',
),
),
'drush-ops/behat-drush-endpoint' =>
@@ -2202,7 +2202,7 @@
'aliases' =>
array (
),
- 'reference' => '80e38d6f6c7ba9c774006b7c720d487268fea764',
+ 'reference' => 'f720046f0ea7cc87f5d356988ae7fbf9885955d7',
),
'pantheon-systems/quicksilver-pushback' =>
array (
@@ -2215,12 +2215,12 @@
),
'pear/archive_tar' =>
array (
- 'pretty_version' => '1.4.13',
- 'version' => '1.4.13.0',
+ 'pretty_version' => '1.4.14',
+ 'version' => '1.4.14.0',
'aliases' =>
array (
),
- 'reference' => '2b87b41178cc6d4ad3cba678a46a1cae49786011',
+ 'reference' => '4d761c5334c790e45ef3245f0864b8955c562caa',
),
'pear/console_getopt' =>
array (
diff --git a/vendor/pear/archive_tar/Archive/Tar.php b/vendor/pear/archive_tar/Archive/Tar.php
index a8c9501ccf..3356ad6ac1 100644
--- a/vendor/pear/archive_tar/Archive/Tar.php
+++ b/vendor/pear/archive_tar/Archive/Tar.php
@@ -2124,25 +2124,40 @@ public function _extractList(
}
}
} elseif ($v_header['typeflag'] == "2") {
+ if (!$p_symlinks) {
+ $this->_warning('Symbolic links are not allowed. '
+ . 'Unable to extract {'
+ . $v_header['filename'] . '}'
+ );
+ return false;
+ }
+ $absolute_link = FALSE;
$link_depth = 0;
- foreach (explode("/", $v_header['filename']) as $dir) {
- if ($dir === "..") {
- $link_depth--;
- } elseif ($dir !== "" && $dir !== "." ) {
- $link_depth++;
- }
+ if (strpos($v_header['link'], "/") === 0 || strpos($v_header['link'], ':') !== FALSE) {
+ $absolute_link = TRUE;
}
- foreach (explode("/", $v_header['link']) as $dir){
- if ($link_depth <= 0) {
- break;
+ else {
+ $s_filename = preg_replace('@^' . preg_quote($p_path) . '@', "", $v_header['filename']);
+ $s_linkname = str_replace('\\', '/', $v_header['link']);
+ foreach (explode("/", $s_filename) as $dir) {
+ if ($dir === "..") {
+ $link_depth--;
+ } elseif ($dir !== "" && $dir !== "." ) {
+ $link_depth++;
+ }
}
- if ($dir === "..") {
- $link_depth--;
- } elseif ($dir !== "" && $dir !== ".") {
- $link_depth++;
+ foreach (explode("/", $s_linkname) as $dir){
+ if ($link_depth <= 0) {
+ break;
+ }
+ if ($dir === "..") {
+ $link_depth--;
+ } elseif ($dir !== "" && $dir !== ".") {
+ $link_depth++;
+ }
}
}
- if (strpos($v_header['link'], "/") === 0 or $link_depth <= 0) {
+ if ($absolute_link || $link_depth <= 0) {
$this->_error(
'Out-of-path file extraction {'
. $v_header['filename'] . ' --> ' .
@@ -2150,13 +2165,6 @@ public function _extractList(
);
return false;
}
- if (!$p_symlinks) {
- $this->_warning('Symbolic links are not allowed. '
- . 'Unable to extract {'
- . $v_header['filename'] . '}'
- );
- return false;
- }
if (@file_exists($v_header['filename'])) {
@unlink($v_header['filename']);
}
diff --git a/vendor/pear/archive_tar/package.xml b/vendor/pear/archive_tar/package.xml
index 8da0d40c9a..d4f20bd4b0 100644
--- a/vendor/pear/archive_tar/package.xml
+++ b/vendor/pear/archive_tar/package.xml
@@ -32,10 +32,10 @@ Also Lzma2 compressed archives are supported with xz extension.</description>
<email>stig@php.net</email>
<active>no</active>
</helper>
- <date>2021-02-16</date>
- <time>10:49:28</time>
+ <date>2021-07-20</date>
+ <time>18:00:00</time>
<version>
- <release>1.4.13</release>
+ <release>1.4.14</release>
<api>1.4.0</api>
</version>
<stability>
@@ -44,7 +44,7 @@ Also Lzma2 compressed archives are supported with xz extension.</description>
</stability>
<license uri="http://www.opensource.org/licenses/bsd-license.php">New BSD License</license>
<notes>
-* Fix Bug #27010: Relative symlinks failing (out-of path file extraction) [mrook]
+* Properly fix symbolic link path traversal (CVE-2021-32610)
</notes>
<contents>
<dir name="/">
@@ -74,6 +74,21 @@ Also Lzma2 compressed archives are supported with xz extension.</description>
</dependencies>
<phprelease />
<changelog>
+ <release>
+ <version>
+ <release>1.4.13</release>
+ <api>1.4.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <date>2021-02-16</date>
+ <license uri="http://www.opensource.org/licenses/bsd-license.php">New BSD License</license>
+ <notes>
+ * Fix Bug #27010: Relative symlinks failing (out-of path file extraction) [mrook]
+ </notes>
+ </release>
<release>
<version>
<release>1.4.12</release>
diff --git a/vendor/pear/archive_tar/tests/relativesymlink.phpt b/vendor/pear/archive_tar/tests/relativesymlink.phpt
index 68cd4b3e2a..9500b52859 100644
--- a/vendor/pear/archive_tar/tests/relativesymlink.phpt
+++ b/vendor/pear/archive_tar/tests/relativesymlink.phpt
@@ -16,8 +16,10 @@ echo 'tests done';
?>
--CLEAN--
<?php
-@unlink('testme/file1.txt');
-@unlink('testme/symlink.txt');
+@unlink('testme/a/file1.txt');
+@unlink('testme/b/symlink.txt');
+@rmdir('testme/a');
+@rmdir('testme/b');
@rmdir('testme');
?>
--EXPECT--
diff --git a/web/core/PATCHES.txt b/web/core/PATCHES.txt
index c514a92338..1c020ea007 100644
--- a/web/core/PATCHES.txt
+++ b/web/core/PATCHES.txt
@@ -1,10 +1,6 @@
This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches)
Patches applied to this directory:
-2799049
-Source: patches/role_based_email_access-2799049-d87.patch
-
-
2862291
Source: https://www.drupal.org/files/issues/2021-01-11/2862291-34.patch
diff --git a/web/core/composer.json b/web/core/composer.json
index 7422607820..17365aabdb 100644
--- a/web/core/composer.json
+++ b/web/core/composer.json
@@ -45,7 +45,7 @@
"laminas/laminas-diactoros": "^2.1",
"composer/semver": "^3.0",
"asm89/stack-cors": "^1.1",
- "pear/archive_tar": "^1.4.12",
+ "pear/archive_tar": "^1.4.14",
"psr/log": "^1.0"
},
"conflict": {
diff --git a/web/core/lib/Drupal.php b/web/core/lib/Drupal.php
index 18b78df308..c16ab97560 100644
--- a/web/core/lib/Drupal.php
+++ b/web/core/lib/Drupal.php
@@ -75,7 +75,7 @@ class Drupal {
/**
* The current system version.
*/
- const VERSION = '9.2.1';
+ const VERSION = '9.2.2';
/**
* Core API compatibility.
diff --git a/web/core/modules/user/src/UserAccessControlHandler.php b/web/core/modules/user/src/UserAccessControlHandler.php
index 0e512a9064..a231d5214d 100644
--- a/web/core/modules/user/src/UserAccessControlHandler.php
+++ b/web/core/modules/user/src/UserAccessControlHandler.php
@@ -125,9 +125,6 @@ protected function checkFieldAccess($operation, FieldDefinitionInterface $field_
// Allow view access to own mail address and other personalization
// settings.
if ($operation == 'view') {
- if ($field_definition->getName() === 'mail' && $account->hasPermission('view user mail field')) {
- return AccessResult::allowed()->cachePerPermissions();
- }
return AccessResult::allowedIf($is_own_account)->cachePerUser();
}
// Anyone that can edit the user can also edit this field.
diff --git a/web/core/modules/user/user.permissions.yml.rej b/web/core/modules/user/user.permissions.yml.rej
deleted file mode 100644
index 7f6fcd0ef8..0000000000
--- a/web/core/modules/user/user.permissions.yml.rej
+++ /dev/null
@@ -1,17 +0,0 @@
-***************
-*** 11,16 ****
- restrict access: true
- access user profiles:
- title: 'View user information'
- change own username:
- title: 'Change own username'
- select account cancellation method:
---- 11,18 ----
- restrict access: true
- access user profiles:
- title: 'View user information'
-+ view user mail field:
-+ title: 'View user mail field'
- change own username:
- title: 'Change own username'
- select account cancellation method:
--
GitLab