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

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

9.2.x
xjm 2022-06-10 14:12:04 -05:00
parent 7c2ee407ae 3428eb70b1
commit f3d81ccd54
No known key found for this signature in database
GPG Key ID: 206B0B8743BDF4C2
4 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
composer.lock generated
View File

@ -534,7 +534,7 @@
"dist": { "dist": {
"type": "path", "type": "path",
"url": "core", "url": "core",
"reference": "dd16302911e953e2f27bacfb848a3233757b4b97" "reference": "f94e2c697c189625cd42955b6e98949fda22c2fc"
}, },
"require": { "require": {
"asm89/stack-cors": "^1.1", "asm89/stack-cors": "^1.1",
@ -555,7 +555,7 @@
"ext-spl": "*", "ext-spl": "*",
"ext-tokenizer": "*", "ext-tokenizer": "*",
"ext-xml": "*", "ext-xml": "*",
"guzzlehttp/guzzle": "^6.5.6", "guzzlehttp/guzzle": "^6.5.7",
"laminas/laminas-diactoros": "^2.1", "laminas/laminas-diactoros": "^2.1",
"laminas/laminas-feed": "^2.12", "laminas/laminas-feed": "^2.12",
"masterminds/html5": "^2.1", "masterminds/html5": "^2.1",
@ -918,16 +918,16 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "6.5.6", "version": "6.5.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "f092dd734083473658de3ee4bef093ed77d2689c" "reference": "724562fa861e21a4071c652c8a159934e4f05592"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/f092dd734083473658de3ee4bef093ed77d2689c", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/724562fa861e21a4071c652c8a159934e4f05592",
"reference": "f092dd734083473658de3ee4bef093ed77d2689c", "reference": "724562fa861e21a4071c652c8a159934e4f05592",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1013,7 +1013,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/guzzle/issues", "issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/6.5.6" "source": "https://github.com/guzzle/guzzle/tree/6.5.7"
}, },
"funding": [ "funding": [
{ {
@ -1029,7 +1029,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-05-25T13:19:12+00:00" "time": "2022-06-09T21:36:50+00:00"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
@ -1058,12 +1058,12 @@
} }
}, },
"autoload": { "autoload": {
"psr-4": {
"GuzzleHttp\\Promise\\": "src/"
},
"files": [ "files": [
"src/functions_include.php" "src/functions_include.php"
] ],
"psr-4": {
"GuzzleHttp\\Promise\\": "src/"
}
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
@ -2440,6 +2440,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"abandoned": "symfony/error-handler",
"time": "2021-05-26T17:39:37+00:00" "time": "2021-05-26T17:39:37+00:00"
}, },
{ {
@ -3189,12 +3190,12 @@
} }
}, },
"autoload": { "autoload": {
"psr-4": {
"Symfony\\Polyfill\\Ctype\\": ""
},
"files": [ "files": [
"bootstrap.php" "bootstrap.php"
] ],
"psr-4": {
"Symfony\\Polyfill\\Ctype\\": ""
}
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
@ -3268,12 +3269,12 @@
} }
}, },
"autoload": { "autoload": {
"psr-4": {
"Symfony\\Polyfill\\Iconv\\": ""
},
"files": [ "files": [
"bootstrap.php" "bootstrap.php"
] ],
"psr-4": {
"Symfony\\Polyfill\\Iconv\\": ""
}
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
@ -3350,12 +3351,12 @@
} }
}, },
"autoload": { "autoload": {
"psr-4": {
"Symfony\\Polyfill\\Intl\\Idn\\": ""
},
"files": [ "files": [
"bootstrap.php" "bootstrap.php"
] ],
"psr-4": {
"Symfony\\Polyfill\\Intl\\Idn\\": ""
}
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
@ -3435,12 +3436,12 @@
} }
}, },
"autoload": { "autoload": {
"psr-4": {
"Symfony\\Polyfill\\Intl\\Normalizer\\": ""
},
"files": [ "files": [
"bootstrap.php" "bootstrap.php"
], ],
"psr-4": {
"Symfony\\Polyfill\\Intl\\Normalizer\\": ""
},
"classmap": [ "classmap": [
"Resources/stubs" "Resources/stubs"
] ]
@ -3519,12 +3520,12 @@
} }
}, },
"autoload": { "autoload": {
"psr-4": {
"Symfony\\Polyfill\\Mbstring\\": ""
},
"files": [ "files": [
"bootstrap.php" "bootstrap.php"
] ],
"psr-4": {
"Symfony\\Polyfill\\Mbstring\\": ""
}
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
@ -3596,12 +3597,12 @@
} }
}, },
"autoload": { "autoload": {
"psr-4": {
"Symfony\\Polyfill\\Php80\\": ""
},
"files": [ "files": [
"bootstrap.php" "bootstrap.php"
], ],
"psr-4": {
"Symfony\\Polyfill\\Php80\\": ""
},
"classmap": [ "classmap": [
"Resources/stubs" "Resources/stubs"
] ]
@ -5784,9 +5785,6 @@
"require": { "require": {
"php": "^7.1 || ^8.0" "php": "^7.1 || ^8.0"
}, },
"replace": {
"myclabs/deep-copy": "self.version"
},
"require-dev": { "require-dev": {
"doctrine/collections": "^1.0", "doctrine/collections": "^1.0",
"doctrine/common": "^2.6", "doctrine/common": "^2.6",
@ -5794,12 +5792,12 @@
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-4": {
"DeepCopy\\": "src/DeepCopy/"
},
"files": [ "files": [
"src/DeepCopy/deep_copy.php" "src/DeepCopy/deep_copy.php"
] ],
"psr-4": {
"DeepCopy\\": "src/DeepCopy/"
}
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
@ -6577,12 +6575,12 @@
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-4": {
"React\\Promise\\": "src/"
},
"files": [ "files": [
"src/functions_include.php" "src/functions_include.php"
] ],
"psr-4": {
"React\\Promise\\": "src/"
}
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [

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

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

2
core/composer.json
View File

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

2
core/lib/Drupal.php
View File

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