From 0fc3ac4968183a1c863fc39c820f3d377505e549 Mon Sep 17 00:00:00 2001
From: Michael Lee <lee.5151@osu.edu>
Date: Tue, 22 Mar 2022 10:03:30 -0400
Subject: [PATCH] Upgrading drupal/core (9.3.8 => 9.3.9)
---
composer.lock | 40 ++--
vendor/composer/installed.json | 54 ++---
vendor/composer/installed.php | 248 ++++++++++----------
vendor/guzzlehttp/psr7/CHANGELOG.md | 12 +
vendor/guzzlehttp/psr7/composer.json | 5 +-
vendor/guzzlehttp/psr7/src/MessageTrait.php | 66 +++++-
web/core/lib/Drupal.php | 2 +-
7 files changed, 249 insertions(+), 178 deletions(-)
diff --git a/composer.lock b/composer.lock
index 1bbb3a888d..61c9b1a2da 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2954,16 +2954,16 @@
},
{
"name": "drupal/core",
- "version": "9.3.8",
+ "version": "9.3.9",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
- "reference": "e8e3b7e5b3353f7ebf24de9d39087df75bd66afe"
+ "reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core/zipball/e8e3b7e5b3353f7ebf24de9d39087df75bd66afe",
- "reference": "e8e3b7e5b3353f7ebf24de9d39087df75bd66afe",
+ "url": "https://api.github.com/repos/drupal/core/zipball/86b0c4496e20ae7f945e9a7f0404fafe191ab774",
+ "reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774",
"shasum": ""
},
"require": {
@@ -3205,9 +3205,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.3.8"
+ "source": "https://github.com/drupal/core/tree/9.3.9"
},
- "time": "2022-03-16T15:34:53+00:00"
+ "time": "2022-03-21T21:21:58+00:00"
},
{
"name": "drupal/core-composer-scaffold",
@@ -3261,16 +3261,16 @@
},
{
"name": "drupal/core-recommended",
- "version": "9.3.8",
+ "version": "9.3.9",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-recommended.git",
- "reference": "98048032809157c723131ecc2394ff55421d5dc6"
+ "reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core-recommended/zipball/98048032809157c723131ecc2394ff55421d5dc6",
- "reference": "98048032809157c723131ecc2394ff55421d5dc6",
+ "url": "https://api.github.com/repos/drupal/core-recommended/zipball/3ce3f2b6145de56178e006fb2ef94089d32cf411",
+ "reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411",
"shasum": ""
},
"require": {
@@ -3279,11 +3279,11 @@
"doctrine/annotations": "1.13.2",
"doctrine/lexer": "1.2.1",
"doctrine/reflection": "1.2.2",
- "drupal/core": "9.3.8",
+ "drupal/core": "9.3.9",
"egulias/email-validator": "3.1.2",
"guzzlehttp/guzzle": "6.5.5",
"guzzlehttp/promises": "1.5.1",
- "guzzlehttp/psr7": "1.8.3",
+ "guzzlehttp/psr7": "1.8.5",
"laminas/laminas-diactoros": "2.8.0",
"laminas/laminas-escaper": "2.9.0",
"laminas/laminas-feed": "2.15.0",
@@ -3341,9 +3341,9 @@
],
"description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
"support": {
- "source": "https://github.com/drupal/core-recommended/tree/9.3.8"
+ "source": "https://github.com/drupal/core-recommended/tree/9.3.9"
},
- "time": "2022-03-16T15:34:53+00:00"
+ "time": "2022-03-21T21:21:58+00:00"
},
{
"name": "drupal/crop",
@@ -8886,16 +8886,16 @@
},
{
"name": "guzzlehttp/psr7",
- "version": "1.8.3",
+ "version": "1.8.5",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85"
+ "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
- "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268",
+ "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268",
"shasum": ""
},
"require": {
@@ -8976,7 +8976,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/1.8.3"
+ "source": "https://github.com/guzzle/psr7/tree/1.8.5"
},
"funding": [
{
@@ -8992,7 +8992,7 @@
"type": "tidelift"
}
],
- "time": "2021-10-05T13:56:00+00:00"
+ "time": "2022-03-20T21:51:18+00:00"
},
{
"name": "j7mbo/twitter-api-php",
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 3ba58757e4..721c4158f5 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -3036,17 +3036,17 @@
},
{
"name": "drupal/core",
- "version": "9.3.8",
- "version_normalized": "9.3.8.0",
+ "version": "9.3.9",
+ "version_normalized": "9.3.9.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
- "reference": "e8e3b7e5b3353f7ebf24de9d39087df75bd66afe"
+ "reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core/zipball/e8e3b7e5b3353f7ebf24de9d39087df75bd66afe",
- "reference": "e8e3b7e5b3353f7ebf24de9d39087df75bd66afe",
+ "url": "https://api.github.com/repos/drupal/core/zipball/86b0c4496e20ae7f945e9a7f0404fafe191ab774",
+ "reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774",
"shasum": ""
},
"require": {
@@ -3213,7 +3213,7 @@
"drupal/workflows": "self.version",
"drupal/workspaces": "self.version"
},
- "time": "2022-03-16T15:34:53+00:00",
+ "time": "2022-03-21T21:21:58+00:00",
"type": "drupal-core",
"extra": {
"drupal-scaffold": {
@@ -3294,7 +3294,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.3.8"
+ "source": "https://github.com/drupal/core/tree/9.3.9"
},
"install-path": "../../web/core"
},
@@ -3350,17 +3350,17 @@
},
{
"name": "drupal/core-recommended",
- "version": "9.3.8",
- "version_normalized": "9.3.8.0",
+ "version": "9.3.9",
+ "version_normalized": "9.3.9.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-recommended.git",
- "reference": "98048032809157c723131ecc2394ff55421d5dc6"
+ "reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core-recommended/zipball/98048032809157c723131ecc2394ff55421d5dc6",
- "reference": "98048032809157c723131ecc2394ff55421d5dc6",
+ "url": "https://api.github.com/repos/drupal/core-recommended/zipball/3ce3f2b6145de56178e006fb2ef94089d32cf411",
+ "reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411",
"shasum": ""
},
"require": {
@@ -3369,11 +3369,11 @@
"doctrine/annotations": "1.13.2",
"doctrine/lexer": "1.2.1",
"doctrine/reflection": "1.2.2",
- "drupal/core": "9.3.8",
+ "drupal/core": "9.3.9",
"egulias/email-validator": "3.1.2",
"guzzlehttp/guzzle": "6.5.5",
"guzzlehttp/promises": "1.5.1",
- "guzzlehttp/psr7": "1.8.3",
+ "guzzlehttp/psr7": "1.8.5",
"laminas/laminas-diactoros": "2.8.0",
"laminas/laminas-escaper": "2.9.0",
"laminas/laminas-feed": "2.15.0",
@@ -3424,7 +3424,7 @@
"conflict": {
"webflo/drupal-core-strict": "*"
},
- "time": "2022-03-16T15:34:53+00:00",
+ "time": "2022-03-21T21:21:58+00:00",
"type": "metapackage",
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -3432,7 +3432,7 @@
],
"description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
"support": {
- "source": "https://github.com/drupal/core-recommended/tree/9.3.8"
+ "source": "https://github.com/drupal/core-recommended/tree/9.3.9"
},
"install-path": null
},
@@ -9218,17 +9218,17 @@
},
{
"name": "guzzlehttp/psr7",
- "version": "1.8.3",
- "version_normalized": "1.8.3.0",
+ "version": "1.8.5",
+ "version_normalized": "1.8.5.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85"
+ "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
- "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268",
+ "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268",
"shasum": ""
},
"require": {
@@ -9246,7 +9246,7 @@
"suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
},
- "time": "2021-10-05T13:56:00+00:00",
+ "time": "2022-03-20T21:51:18+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -9255,12 +9255,12 @@
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "GuzzleHttp\\Psr7\\": "src/"
- },
"files": [
"src/functions_include.php"
- ]
+ ],
+ "psr-4": {
+ "GuzzleHttp\\Psr7\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -9311,7 +9311,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/1.8.3"
+ "source": "https://github.com/guzzle/psr7/tree/1.8.5"
},
"funding": [
{
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 53a6050034..a22694ab85 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -5,7 +5,7 @@
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => '368e396a490173266d2dd878d3722f34bb5c7880',
+ 'reference' => '6776578c76ff7260a938a8e2680beece66da8c4e',
'name' => 'osu-asc-webservices/d8-upstream',
'dev' => true,
),
@@ -271,7 +271,7 @@
'drupal/action' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/addtocalendar' => array(
@@ -304,7 +304,7 @@
'drupal/aggregator' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/allowed_formats' => array(
@@ -328,25 +328,25 @@
'drupal/automated_cron' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/ban' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/bartik' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/basic_auth' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/better_exposed_filters' => array(
@@ -361,19 +361,19 @@
'drupal/big_pipe' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/block' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/block_content' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/block_field' => array(
@@ -406,7 +406,7 @@
'drupal/book' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/bootstrap' => array(
@@ -421,7 +421,7 @@
'drupal/breakpoint' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/cache_control_override' => array(
@@ -445,13 +445,13 @@
'drupal/ckeditor' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/ckeditor5' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/ckeditor_indentblock' => array(
@@ -466,31 +466,31 @@
'drupal/claro' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/classy' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/color' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/comment' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/config' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/config_direct_save' => array(
@@ -523,7 +523,7 @@
'drupal/config_translation' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/config_update' => array(
@@ -574,7 +574,7 @@
'drupal/contact' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/content_access' => array(
@@ -589,52 +589,52 @@
'drupal/content_moderation' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/content_translation' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/contextual' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core' => array(
- 'pretty_version' => '9.3.8',
- 'version' => '9.3.8.0',
+ 'pretty_version' => '9.3.9',
+ 'version' => '9.3.9.0',
'type' => 'drupal-core',
'install_path' => __DIR__ . '/../../web/core',
'aliases' => array(),
- 'reference' => 'e8e3b7e5b3353f7ebf24de9d39087df75bd66afe',
+ 'reference' => '86b0c4496e20ae7f945e9a7f0404fafe191ab774',
'dev_requirement' => false,
),
'drupal/core-annotation' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-assertion' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-bridge' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-class-finder' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-composer-scaffold' => array(
@@ -649,136 +649,136 @@
'drupal/core-datetime' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-dependency-injection' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-diff' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-discovery' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-event-dispatcher' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-file-cache' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-file-security' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-filesystem' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-front-matter' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-gettext' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-graph' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-http-foundation' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-php-storage' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-plugin' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-proxy-builder' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-recommended' => array(
- 'pretty_version' => '9.3.8',
- 'version' => '9.3.8.0',
+ 'pretty_version' => '9.3.9',
+ 'version' => '9.3.9.0',
'type' => 'metapackage',
'install_path' => NULL,
'aliases' => array(),
- 'reference' => '98048032809157c723131ecc2394ff55421d5dc6',
+ 'reference' => '3ce3f2b6145de56178e006fb2ef94089d32cf411',
'dev_requirement' => false,
),
'drupal/core-render' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-serialization' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-transliteration' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-utility' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-uuid' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/core-version' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/crop' => array(
@@ -802,19 +802,19 @@
'drupal/datetime' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/datetime_range' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/dblog' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/dropzonejs' => array(
@@ -838,13 +838,13 @@
'drupal/dynamic_page_cache' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/editor' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/editor_advanced_link' => array(
@@ -913,7 +913,7 @@
'drupal/entity_reference' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/entity_reference_revisions' => array(
@@ -946,7 +946,7 @@
'drupal/field' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/field_group' => array(
@@ -961,7 +961,7 @@
'drupal/field_layout' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/field_permissions' => array(
@@ -976,13 +976,13 @@
'drupal/field_ui' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/file' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/file_browser' => array(
@@ -997,7 +997,7 @@
'drupal/filter' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/focal_point' => array(
@@ -1012,7 +1012,7 @@
'drupal/forum' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/google_analytics' => array(
@@ -1036,25 +1036,25 @@
'drupal/hal' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/help' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/help_topics' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/history' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/honeypot' => array(
@@ -1069,7 +1069,7 @@
'drupal/image' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/inline_entity_form' => array(
@@ -1084,7 +1084,7 @@
'drupal/inline_form_errors' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/jquery_ui' => array(
@@ -1126,25 +1126,25 @@
'drupal/jsonapi' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/language' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/layout_builder' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/layout_discovery' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/libraries' => array(
@@ -1159,7 +1159,7 @@
'drupal/link' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/link_attributes' => array(
@@ -1183,7 +1183,7 @@
'drupal/locale' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/mathjax' => array(
@@ -1198,7 +1198,7 @@
'drupal/media' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/media_entity_browser' => array(
@@ -1222,7 +1222,7 @@
'drupal/media_library' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/menu_block' => array(
@@ -1246,13 +1246,13 @@
'drupal/menu_link_content' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/menu_ui' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/metatag' => array(
@@ -1267,7 +1267,7 @@
'drupal/migrate' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/migrate_devel' => array(
@@ -1282,19 +1282,19 @@
'drupal/migrate_drupal' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/migrate_drupal_multilingual' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/migrate_drupal_ui' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/migrate_plus' => array(
@@ -1318,7 +1318,7 @@
'drupal/minimal' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/mobile_detect' => array(
@@ -1360,25 +1360,25 @@
'drupal/node' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/olivero' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/options' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/page_cache' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/pantheon_advanced_page_cache' => array(
@@ -1402,13 +1402,13 @@
'drupal/path' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/path_alias' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/pathauto' => array(
@@ -1432,13 +1432,13 @@
'drupal/quickedit' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/rdf' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/rebuild_cache_access' => array(
@@ -1480,13 +1480,13 @@
'drupal/responsive_image' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/rest' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/roleassign' => array(
@@ -1510,7 +1510,7 @@
'drupal/search' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/search_api' => array(
@@ -1534,25 +1534,25 @@
'drupal/serialization' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/settings_tray' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/seven' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/shortcut' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/simple_gmap' => array(
@@ -1621,19 +1621,19 @@
'drupal/standard' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/stark' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/statistics' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/superfish' => array(
@@ -1657,31 +1657,31 @@
'drupal/syslog' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/system' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/taxonomy' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/telephone' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/text' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/token' => array(
@@ -1696,19 +1696,19 @@
'drupal/toolbar' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/tour' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/tracker' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/twig_tweak' => array(
@@ -1741,13 +1741,13 @@
'drupal/update' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/user' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/userprotect' => array(
@@ -1780,7 +1780,7 @@
'drupal/views' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/views_ajax_history' => array(
@@ -1840,7 +1840,7 @@
'drupal/views_ui' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/webform' => array(
@@ -1855,13 +1855,13 @@
'drupal/workflows' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drupal/workspaces' => array(
'dev_requirement' => false,
'replaced' => array(
- 0 => '9.3.8',
+ 0 => '9.3.9',
),
),
'drush-ops/behat-drush-endpoint' => array(
@@ -1982,12 +1982,12 @@
'dev_requirement' => false,
),
'guzzlehttp/psr7' => array(
- 'pretty_version' => '1.8.3',
- 'version' => '1.8.3.0',
+ 'pretty_version' => '1.8.5',
+ 'version' => '1.8.5.0',
'type' => 'library',
'install_path' => __DIR__ . '/../guzzlehttp/psr7',
'aliases' => array(),
- 'reference' => '1afdd860a2566ed3c2b0b4a3de6e23434a79ec85',
+ 'reference' => '337e3ad8e5716c15f9657bd214d16cc5e69df268',
'dev_requirement' => false,
),
'j7mbo/twitter-api-php' => array(
@@ -2101,7 +2101,7 @@
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => '368e396a490173266d2dd878d3722f34bb5c7880',
+ 'reference' => '6776578c76ff7260a938a8e2680beece66da8c4e',
'dev_requirement' => false,
),
'pantheon-systems/quicksilver-pushback' => array(
diff --git a/vendor/guzzlehttp/psr7/CHANGELOG.md b/vendor/guzzlehttp/psr7/CHANGELOG.md
index f40736c4eb..f177f583fb 100644
--- a/vendor/guzzlehttp/psr7/CHANGELOG.md
+++ b/vendor/guzzlehttp/psr7/CHANGELOG.md
@@ -9,6 +9,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## Unreleased
+## 1.8.5 - 2022-03-20
+
+### Fixed
+
+- Correct header value validation
+
+## 1.8.4 - 2022-03-20
+
+### Fixed
+
+- Validate header values properly
+
## 1.8.3 - 2021-10-05
### Fixed
diff --git a/vendor/guzzlehttp/psr7/composer.json b/vendor/guzzlehttp/psr7/composer.json
index bfa7cfdc16..7ecdc8ba3e 100644
--- a/vendor/guzzlehttp/psr7/composer.json
+++ b/vendor/guzzlehttp/psr7/composer.json
@@ -68,6 +68,9 @@
},
"config": {
"preferred-install": "dist",
- "sort-packages": true
+ "sort-packages": true,
+ "allow-plugins": {
+ "bamarni/composer-bin-plugin": true
+ }
}
}
diff --git a/vendor/guzzlehttp/psr7/src/MessageTrait.php b/vendor/guzzlehttp/psr7/src/MessageTrait.php
index 99203bb43a..0ac8663da5 100644
--- a/vendor/guzzlehttp/psr7/src/MessageTrait.php
+++ b/vendor/guzzlehttp/psr7/src/MessageTrait.php
@@ -157,17 +157,22 @@ private function setHeaders(array $headers)
}
}
+ /**
+ * @param mixed $value
+ *
+ * @return string[]
+ */
private function normalizeHeaderValue($value)
{
if (!is_array($value)) {
- return $this->trimHeaderValues([$value]);
+ return $this->trimAndValidateHeaderValues([$value]);
}
if (count($value) === 0) {
throw new \InvalidArgumentException('Header value can not be an empty array.');
}
- return $this->trimHeaderValues($value);
+ return $this->trimAndValidateHeaderValues($value);
}
/**
@@ -178,13 +183,13 @@ private function normalizeHeaderValue($value)
* header-field = field-name ":" OWS field-value OWS
* OWS = *( SP / HTAB )
*
- * @param string[] $values Header values
+ * @param mixed[] $values Header values
*
* @return string[] Trimmed header values
*
* @see https://tools.ietf.org/html/rfc7230#section-3.2.4
*/
- private function trimHeaderValues(array $values)
+ private function trimAndValidateHeaderValues(array $values)
{
return array_map(function ($value) {
if (!is_scalar($value) && null !== $value) {
@@ -194,10 +199,20 @@ private function trimHeaderValues(array $values)
));
}
- return trim((string) $value, " \t");
+ $trimmed = trim((string) $value, " \t");
+ $this->assertValue($trimmed);
+
+ return $trimmed;
}, array_values($values));
}
+ /**
+ * @see https://tools.ietf.org/html/rfc7230#section-3.2
+ *
+ * @param mixed $header
+ *
+ * @return void
+ */
private function assertHeader($header)
{
if (!is_string($header)) {
@@ -210,5 +225,46 @@ private function assertHeader($header)
if ($header === '') {
throw new \InvalidArgumentException('Header name can not be empty.');
}
+
+ if (! preg_match('/^[a-zA-Z0-9\'`#$%&*+.^_|~!-]+$/', $header)) {
+ throw new \InvalidArgumentException(
+ sprintf(
+ '"%s" is not valid header name',
+ $header
+ )
+ );
+ }
+ }
+
+ /**
+ * @param string $value
+ *
+ * @return void
+ *
+ * @see https://tools.ietf.org/html/rfc7230#section-3.2
+ *
+ * field-value = *( field-content / obs-fold )
+ * field-content = field-vchar [ 1*( SP / HTAB ) field-vchar ]
+ * field-vchar = VCHAR / obs-text
+ * VCHAR = %x21-7E
+ * obs-text = %x80-FF
+ * obs-fold = CRLF 1*( SP / HTAB )
+ */
+ private function assertValue($value)
+ {
+ // The regular expression intentionally does not support the obs-fold production, because as
+ // per RFC 7230#3.2.4:
+ //
+ // A sender MUST NOT generate a message that includes
+ // line folding (i.e., that has any field-value that contains a match to
+ // the obs-fold rule) unless the message is intended for packaging
+ // within the message/http media type.
+ //
+ // Clients must not send a request with line folding and a server sending folded headers is
+ // likely very rare. Line folding is a fairly obscure feature of HTTP/1.1 and thus not accepting
+ // folding is not likely to break any legitimate use case.
+ if (! preg_match('/^[\x20\x09\x21-\x7E\x80-\xFF]*$/', $value)) {
+ throw new \InvalidArgumentException(sprintf('"%s" is not valid header value', $value));
+ }
}
}
diff --git a/web/core/lib/Drupal.php b/web/core/lib/Drupal.php
index d228aba352..200fb50247 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.3.8';
+ const VERSION = '9.3.9';
/**
* Core API compatibility.
--
GitLab