Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 9.2.20, resolve merge conflicts, and update lockfile and dev versions.

9.2.x
xjm 2022-05-25 13:48:26 -05:00
parent 94c3ae4291 dddf4bdf8d
commit 7c2ee407ae
No known key found for this signature in database
GPG Key ID: 206B0B8743BDF4C2
4 changed files with 59 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
composer.lock generated
View File

@ -534,7 +534,7 @@
"dist": {
"type": "path",
"url": "core",
"reference": "107b1d4f65408eb2844facd227005517de15343b"
"reference": "dd16302911e953e2f27bacfb848a3233757b4b97"
},
"require": {
"asm89/stack-cors": "^1.1",
@ -555,7 +555,7 @@
"ext-spl": "*",
"ext-tokenizer": "*",
"ext-xml": "*",
"guzzlehttp/guzzle": "^6.5.2",
"guzzlehttp/guzzle": "^6.5.6",
"laminas/laminas-diactoros": "^2.1",
"laminas/laminas-feed": "^2.12",
"masterminds/html5": "^2.1",
@ -918,16 +918,16 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "6.5.5",
"version": "6.5.6",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
"reference": "f092dd734083473658de3ee4bef093ed77d2689c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
"reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/f092dd734083473658de3ee4bef093ed77d2689c",
"reference": "f092dd734083473658de3ee4bef093ed77d2689c",
"shasum": ""
},
"require": {
@ -952,22 +952,52 @@
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\": "src/"
},
"files": [
"src/functions_include.php"
]
],
"psr-4": {
"GuzzleHttp\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Graham Campbell",
"email": "hello@gjcampbell.co.uk",
"homepage": "https://github.com/GrahamCampbell"
},
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
{
"name": "Jeremy Lindblom",
"email": "jeremeamia@gmail.com",
"homepage": "https://github.com/jeremeamia"
},
{
"name": "George Mponos",
"email": "gmponos@gmail.com",
"homepage": "https://github.com/gmponos"
},
{
"name": "Tobias Nyholm",
"email": "tobias.nyholm@gmail.com",
"homepage": "https://github.com/Nyholm"
},
{
"name": "Márk Sági-Kazár",
"email": "mark.sagikazar@gmail.com",
"homepage": "https://github.com/sagikazarmark"
},
{
"name": "Tobias Schultze",
"email": "webmaster@tubo-world.de",
"homepage": "https://github.com/Tobion"
}
],
"description": "Guzzle is a PHP HTTP client library",
@ -983,9 +1013,23 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/6.5"
"source": "https://github.com/guzzle/guzzle/tree/6.5.6"
},
"time": "2020-06-16T21:01:06+00:00"
"funding": [
{
"url": "https://github.com/GrahamCampbell",
"type": "github"
},
{
"url": "https://github.com/Nyholm",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
"type": "tidelift"
}
],
"time": "2022-05-25T13:19:12+00:00"
},
{
"name": "guzzlehttp/promises",

2
composer/Metapackage/CoreRecommended/composer.json
View File

@ -14,7 +14,7 @@
"doctrine/lexer": "1.2.1",
"doctrine/reflection": "1.2.2",
"egulias/email-validator": "2.1.25",
"guzzlehttp/guzzle": "6.5.5",
"guzzlehttp/guzzle": "6.5.6",
"guzzlehttp/promises": "1.4.1",
"guzzlehttp/psr7": "1.8.5",
"laminas/laminas-diactoros": "2.6.0",

2
core/composer.json
View File

@ -35,7 +35,7 @@
"twig/twig": "^2.12.0",
"doctrine/reflection": "^1.1",
"doctrine/annotations": "^1.12",
"guzzlehttp/guzzle": "^6.5.2",
"guzzlehttp/guzzle": "^6.5.6",
"symfony-cmf/routing": "^2.1",
"laminas/laminas-feed": "^2.12",
"stack/builder": "^1.0",

2
core/lib/Drupal.php
View File

@ -75,7 +75,7 @@ class Drupal {
/**
* The current system version.
*/
const VERSION = '9.2.20-dev';
const VERSION = '9.2.21-dev';
/**
* Core API compatibility.