diff --git a/composer.lock b/composer.lock
index 43a63cef848f660be3a61613b29e557f2de0af59..ed9d5fd0158704d2bb14fe3df1a1fca8c6bdb6ad 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1820,7 +1820,7 @@
},
{
"name": "symfony/class-loader",
- "version": "v3.4.32",
+ "version": "v3.4.35",
"source": {
"type": "git",
"url": "https://github.com/symfony/class-loader.git",
@@ -1876,16 +1876,16 @@
},
{
"name": "symfony/console",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "aa43e86fe32b03a4518096240a35f8f52c6cac8f"
+ "reference": "35d9077f495c6d184d9930f7a7ecbd1ad13c7ab8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/aa43e86fe32b03a4518096240a35f8f52c6cac8f",
- "reference": "aa43e86fe32b03a4518096240a35f8f52c6cac8f",
+ "url": "https://api.github.com/repos/symfony/console/zipball/35d9077f495c6d184d9930f7a7ecbd1ad13c7ab8",
+ "reference": "35d9077f495c6d184d9930f7a7ecbd1ad13c7ab8",
"shasum": ""
},
"require": {
@@ -1948,20 +1948,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2019-10-17T12:23:42+00:00"
+ "time": "2019-11-13T07:39:40+00:00"
},
{
"name": "symfony/debug",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "25fd3ba9cf14a2201aeaab9e0c4b8f455cbf0db7"
+ "reference": "b24b791f817116b29e52a63e8544884cf9a40757"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/25fd3ba9cf14a2201aeaab9e0c4b8f455cbf0db7",
- "reference": "25fd3ba9cf14a2201aeaab9e0c4b8f455cbf0db7",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/b24b791f817116b29e52a63e8544884cf9a40757",
+ "reference": "b24b791f817116b29e52a63e8544884cf9a40757",
"shasum": ""
},
"require": {
@@ -2004,20 +2004,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2019-10-15T13:25:17+00:00"
+ "time": "2019-11-10T17:54:30+00:00"
},
{
"name": "symfony/dependency-injection",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "556a6b31f294491e6db624f2d5c0fa935cbeb2b3"
+ "reference": "3402ac9d27a88dde024694defce28329034c96f7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/556a6b31f294491e6db624f2d5c0fa935cbeb2b3",
- "reference": "556a6b31f294491e6db624f2d5c0fa935cbeb2b3",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/3402ac9d27a88dde024694defce28329034c96f7",
+ "reference": "3402ac9d27a88dde024694defce28329034c96f7",
"shasum": ""
},
"require": {
@@ -2026,7 +2026,7 @@
"symfony/service-contracts": "^1.1.6|^2"
},
"conflict": {
- "symfony/config": "<4.3",
+ "symfony/config": "<4.3|>=5.0",
"symfony/finder": "<3.4",
"symfony/proxy-manager-bridge": "<3.4",
"symfony/yaml": "<3.4"
@@ -2036,7 +2036,7 @@
"symfony/service-implementation": "1.0"
},
"require-dev": {
- "symfony/config": "^4.3|^5.0",
+ "symfony/config": "^4.3",
"symfony/expression-language": "^3.4|^4.0|^5.0",
"symfony/yaml": "^3.4|^4.0|^5.0"
},
@@ -2077,93 +2077,31 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2019-10-14T12:27:06+00:00"
+ "time": "2019-11-12T14:51:11+00:00"
},
{
"name": "symfony/error-handler",
- "version": "dev-master",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
- "reference": "b9953aca90ef7f0ae8ff2a6b06a7221c4a8a77f4"
+ "reference": "ee9121938fea18b0898a39aa5307ae3657b21abc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/error-handler/zipball/b9953aca90ef7f0ae8ff2a6b06a7221c4a8a77f4",
- "reference": "b9953aca90ef7f0ae8ff2a6b06a7221c4a8a77f4",
- "shasum": ""
- },
- "require": {
- "php": "^7.2.9",
- "psr/log": "~1.0"
- },
- "conflict": {
- "symfony/http-kernel": "<3.4"
- },
- "require-dev": {
- "symfony/http-kernel": "^3.4|^4.0|^5.0"
- },
- "suggest": {
- "symfony/error-renderer": "For better error rendering"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\ErrorHandler\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony ErrorHandler Component",
- "homepage": "https://symfony.com",
- "time": "2019-10-11T14:48:48+00:00"
- },
- {
- "name": "symfony/error-renderer",
- "version": "4.4.x-dev",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/error-renderer.git",
- "reference": "fca8c2913839d4b3031bf6d14112ddad216c90b3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/error-renderer/zipball/fca8c2913839d4b3031bf6d14112ddad216c90b3",
- "reference": "fca8c2913839d4b3031bf6d14112ddad216c90b3",
+ "url": "https://api.github.com/repos/symfony/error-handler/zipball/ee9121938fea18b0898a39aa5307ae3657b21abc",
+ "reference": "ee9121938fea18b0898a39aa5307ae3657b21abc",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"psr/log": "~1.0",
- "symfony/debug": "^4.4"
- },
- "conflict": {
- "symfony/http-kernel": "<4.4"
+ "symfony/debug": "^4.4",
+ "symfony/var-dumper": "^4.4|^5.0"
},
"require-dev": {
- "symfony/console": "^4.4",
- "symfony/dependency-injection": "^4.4",
- "symfony/http-kernel": "^4.4"
+ "symfony/http-kernel": "^4.4|^5.0",
+ "symfony/serializer": "^4.4|^5.0"
},
"type": "library",
"extra": {
@@ -2173,7 +2111,7 @@
},
"autoload": {
"psr-4": {
- "Symfony\\Component\\ErrorRenderer\\": ""
+ "Symfony\\Component\\ErrorHandler\\": ""
},
"exclude-from-classmap": [
"/Tests/"
@@ -2188,36 +2126,32 @@
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
- {
- "name": "Yonel Ceruto",
- "email": "yonelceruto@gmail.com"
- },
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony ErrorRenderer Component",
+ "description": "Symfony ErrorHandler Component",
"homepage": "https://symfony.com",
- "time": "2019-10-15T13:25:17+00:00"
+ "time": "2019-11-12T17:18:47+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "c73bdefc20ff6e180f878122e07f1f59afba03f5"
+ "reference": "ab1c43e17fff802bef0a898f3bc088ac33b8e0e1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c73bdefc20ff6e180f878122e07f1f59afba03f5",
- "reference": "c73bdefc20ff6e180f878122e07f1f59afba03f5",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ab1c43e17fff802bef0a898f3bc088ac33b8e0e1",
+ "reference": "ab1c43e17fff802bef0a898f3bc088ac33b8e0e1",
"shasum": ""
},
"require": {
"php": "^7.1.3",
- "symfony/event-dispatcher-contracts": "^1.1|^2"
+ "symfony/event-dispatcher-contracts": "^1.1"
},
"conflict": {
"symfony/dependency-injection": "<3.4"
@@ -2269,7 +2203,7 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2019-10-09T14:35:36+00:00"
+ "time": "2019-11-08T22:40:51+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@@ -2331,16 +2265,16 @@
},
{
"name": "symfony/http-foundation",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "002d69de1041f82f2cc16a2776a2e069ef14017a"
+ "reference": "e6e2b4e3fc2b25724701235ed5a9065da0bd06a8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/002d69de1041f82f2cc16a2776a2e069ef14017a",
- "reference": "002d69de1041f82f2cc16a2776a2e069ef14017a",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e6e2b4e3fc2b25724701235ed5a9065da0bd06a8",
+ "reference": "e6e2b4e3fc2b25724701235ed5a9065da0bd06a8",
"shasum": ""
},
"require": {
@@ -2382,27 +2316,26 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2019-10-14T12:27:06+00:00"
+ "time": "2019-11-13T07:39:40+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "a228a47b9d327c33254d24d2c3a26f456cfaae54"
+ "reference": "d84a893b30ffad14bcea86d7f09c408c82858027"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a228a47b9d327c33254d24d2c3a26f456cfaae54",
- "reference": "a228a47b9d327c33254d24d2c3a26f456cfaae54",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d84a893b30ffad14bcea86d7f09c408c82858027",
+ "reference": "d84a893b30ffad14bcea86d7f09c408c82858027",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"psr/log": "~1.0",
- "symfony/error-handler": "^4.4|^5.0",
- "symfony/error-renderer": "^4.4|^5.0",
+ "symfony/error-handler": "^4.4",
"symfony/event-dispatcher": "^4.4",
"symfony/http-foundation": "^4.4|^5.0",
"symfony/polyfill-ctype": "^1.8",
@@ -2414,7 +2347,6 @@
"symfony/console": ">=5",
"symfony/dependency-injection": "<4.3",
"symfony/translation": "<4.2",
- "symfony/var-dumper": "<4.1.1",
"twig/twig": "<1.34|<2.4,>=2"
},
"provide": {
@@ -2436,15 +2368,13 @@
"symfony/templating": "^3.4|^4.0|^5.0",
"symfony/translation": "^4.2|^5.0",
"symfony/translation-contracts": "^1.1|^2",
- "symfony/var-dumper": "^4.1.1|^5.0",
"twig/twig": "^1.34|^2.4|^3.0"
},
"suggest": {
"symfony/browser-kit": "",
"symfony/config": "",
"symfony/console": "",
- "symfony/dependency-injection": "",
- "symfony/var-dumper": ""
+ "symfony/dependency-injection": ""
},
"type": "library",
"extra": {
@@ -2476,20 +2406,20 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2019-10-15T13:39:57+00:00"
+ "time": "2019-11-13T09:13:36+00:00"
},
{
"name": "symfony/mime",
- "version": "v4.3.5",
+ "version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
- "reference": "32f71570547b91879fdbd9cf50317d556ae86916"
+ "reference": "22aecf6b11638ef378fab25d6c5a2da8a31a1448"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mime/zipball/32f71570547b91879fdbd9cf50317d556ae86916",
- "reference": "32f71570547b91879fdbd9cf50317d556ae86916",
+ "url": "https://api.github.com/repos/symfony/mime/zipball/22aecf6b11638ef378fab25d6c5a2da8a31a1448",
+ "reference": "22aecf6b11638ef378fab25d6c5a2da8a31a1448",
"shasum": ""
},
"require": {
@@ -2535,7 +2465,7 @@
"mime",
"mime-type"
],
- "time": "2019-09-19T17:00:15+00:00"
+ "time": "2019-11-12T13:10:02+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -2890,16 +2820,16 @@
},
{
"name": "symfony/process",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "5ec74072c1d2d582ac2271387a7ff5f69ea407f3"
+ "reference": "75ad33d9b6f25325ebc396d68ad86fd74bcfbb06"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/5ec74072c1d2d582ac2271387a7ff5f69ea407f3",
- "reference": "5ec74072c1d2d582ac2271387a7ff5f69ea407f3",
+ "url": "https://api.github.com/repos/symfony/process/zipball/75ad33d9b6f25325ebc396d68ad86fd74bcfbb06",
+ "reference": "75ad33d9b6f25325ebc396d68ad86fd74bcfbb06",
"shasum": ""
},
"require": {
@@ -2935,7 +2865,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2019-10-03T11:24:03+00:00"
+ "time": "2019-10-28T20:30:34+00:00"
},
{
"name": "symfony/psr-http-message-bridge",
@@ -3004,16 +2934,16 @@
},
{
"name": "symfony/routing",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "9e472b4799cd964ea05b3dce69f831afbc1fef07"
+ "reference": "99876ba2ac4fd8fa07db6b3cf3db2ab3aa0caa6a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/9e472b4799cd964ea05b3dce69f831afbc1fef07",
- "reference": "9e472b4799cd964ea05b3dce69f831afbc1fef07",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/99876ba2ac4fd8fa07db6b3cf3db2ab3aa0caa6a",
+ "reference": "99876ba2ac4fd8fa07db6b3cf3db2ab3aa0caa6a",
"shasum": ""
},
"require": {
@@ -3076,20 +3006,20 @@
"uri",
"url"
],
- "time": "2019-10-07T12:37:47+00:00"
+ "time": "2019-11-12T14:51:11+00:00"
},
{
"name": "symfony/serializer",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/serializer.git",
- "reference": "c7e56d852d362f396828fba91799186443c75cbd"
+ "reference": "57116a962eb0c5e165009535f1e1d2e7024e78de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/serializer/zipball/c7e56d852d362f396828fba91799186443c75cbd",
- "reference": "c7e56d852d362f396828fba91799186443c75cbd",
+ "url": "https://api.github.com/repos/symfony/serializer/zipball/57116a962eb0c5e165009535f1e1d2e7024e78de",
+ "reference": "57116a962eb0c5e165009535f1e1d2e7024e78de",
"shasum": ""
},
"require": {
@@ -3106,10 +3036,11 @@
"require-dev": {
"doctrine/annotations": "~1.0",
"doctrine/cache": "~1.0",
- "phpdocumentor/reflection-docblock": "^3.0|^4.0",
+ "phpdocumentor/reflection-docblock": "^3.2|^4.0",
"symfony/cache": "^3.4|^4.0|^5.0",
"symfony/config": "^3.4|^4.0|^5.0",
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
+ "symfony/error-handler": "^4.4|^5.0",
"symfony/http-foundation": "^3.4|^4.0|^5.0",
"symfony/property-access": "^3.4|^4.0|^5.0",
"symfony/property-info": "^3.4.13|~4.0|^5.0",
@@ -3156,24 +3087,24 @@
],
"description": "Symfony Serializer Component",
"homepage": "https://symfony.com",
- "time": "2019-10-14T11:43:44+00:00"
+ "time": "2019-11-13T07:39:40+00:00"
},
{
"name": "symfony/service-contracts",
- "version": "v1.1.7",
+ "version": "v2.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0"
+ "reference": "9d99e1556417bf227a62e14856d630672bf10eaf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffcde9615dc5bb4825b9f6aed07716f1f57faae0",
- "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/9d99e1556417bf227a62e14856d630672bf10eaf",
+ "reference": "9d99e1556417bf227a62e14856d630672bf10eaf",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
+ "php": "^7.2.9",
"psr/container": "^1.0"
},
"suggest": {
@@ -3182,7 +3113,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-master": "2.0-dev"
}
},
"autoload": {
@@ -3214,20 +3145,20 @@
"interoperability",
"standards"
],
- "time": "2019-09-17T11:12:18+00:00"
+ "time": "2019-11-09T09:18:34+00:00"
},
{
"name": "symfony/translation",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "01a25cb05214a272addbdb5fe5b724b9a4b578ab"
+ "reference": "897fb68ee7933372517b551d6f08c6d4bb0b8c40"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/01a25cb05214a272addbdb5fe5b724b9a4b578ab",
- "reference": "01a25cb05214a272addbdb5fe5b724b9a4b578ab",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/897fb68ee7933372517b551d6f08c6d4bb0b8c40",
+ "reference": "897fb68ee7933372517b551d6f08c6d4bb0b8c40",
"shasum": ""
},
"require": {
@@ -3238,6 +3169,7 @@
"conflict": {
"symfony/config": "<3.4",
"symfony/dependency-injection": "<3.4",
+ "symfony/http-kernel": "<4.4",
"symfony/yaml": "<3.4"
},
"provide": {
@@ -3249,10 +3181,9 @@
"symfony/console": "^3.4|^4.0|^5.0",
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
"symfony/finder": "~2.8|~3.0|~4.0|^5.0",
- "symfony/http-kernel": "^3.4|^4.0|^5.0",
+ "symfony/http-kernel": "^4.4",
"symfony/intl": "^3.4|^4.0|^5.0",
"symfony/service-contracts": "^1.1.2|^2",
- "symfony/var-dumper": "^3.4|^4.0|^5.0",
"symfony/yaml": "^3.4|^4.0|^5.0"
},
"suggest": {
@@ -3290,24 +3221,24 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2019-10-17T12:23:42+00:00"
+ "time": "2019-11-12T17:18:47+00:00"
},
{
"name": "symfony/translation-contracts",
- "version": "v1.1.7",
+ "version": "v2.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
- "reference": "364518c132c95642e530d9b2d217acbc2ccac3e6"
+ "reference": "8feb81e6bb1a42d6a3b1429c751d291eb6d05297"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/364518c132c95642e530d9b2d217acbc2ccac3e6",
- "reference": "364518c132c95642e530d9b2d217acbc2ccac3e6",
+ "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/8feb81e6bb1a42d6a3b1429c751d291eb6d05297",
+ "reference": "8feb81e6bb1a42d6a3b1429c751d291eb6d05297",
"shasum": ""
},
"require": {
- "php": "^7.1.3"
+ "php": "^7.2.9"
},
"suggest": {
"symfony/translation-implementation": ""
@@ -3315,7 +3246,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-master": "2.0-dev"
}
},
"autoload": {
@@ -3347,20 +3278,20 @@
"interoperability",
"standards"
],
- "time": "2019-09-17T11:12:18+00:00"
+ "time": "2019-11-09T09:18:34+00:00"
},
{
"name": "symfony/validator",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/validator.git",
- "reference": "137d3f679277d8b8604fff35adb717eb6c1746de"
+ "reference": "56be252ae6ac7ae1a2f524ed33a47160a1f7c88c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/validator/zipball/137d3f679277d8b8604fff35adb717eb6c1746de",
- "reference": "137d3f679277d8b8604fff35adb717eb6c1746de",
+ "url": "https://api.github.com/repos/symfony/validator/zipball/56be252ae6ac7ae1a2f524ed33a47160a1f7c88c",
+ "reference": "56be252ae6ac7ae1a2f524ed33a47160a1f7c88c",
"shasum": ""
},
"require": {
@@ -3373,7 +3304,7 @@
"doctrine/lexer": "<1.0.2",
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
"symfony/dependency-injection": "<3.4",
- "symfony/http-kernel": "<3.4",
+ "symfony/http-kernel": "<4.4",
"symfony/intl": "<4.3",
"symfony/translation": ">=5.0",
"symfony/yaml": "<3.4"
@@ -3388,12 +3319,11 @@
"symfony/expression-language": "^3.4|^4.0|^5.0",
"symfony/http-client": "^4.3|^5.0",
"symfony/http-foundation": "^4.1|^5.0",
- "symfony/http-kernel": "^3.4|^4.0|^5.0",
+ "symfony/http-kernel": "^4.4",
"symfony/intl": "^4.3|^5.0",
"symfony/property-access": "^3.4|^4.0|^5.0",
"symfony/property-info": "^3.4|^4.0|^5.0",
"symfony/translation": "^4.2",
- "symfony/var-dumper": "^3.4|^4.0|^5.0",
"symfony/yaml": "^3.4|^4.0|^5.0"
},
"suggest": {
@@ -3440,20 +3370,95 @@
],
"description": "Symfony Validator Component",
"homepage": "https://symfony.com",
- "time": "2019-10-09T14:34:05+00:00"
+ "time": "2019-11-12T17:18:47+00:00"
+ },
+ {
+ "name": "symfony/var-dumper",
+ "version": "v5.0.0-BETA2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/var-dumper.git",
+ "reference": "98c818996296dd3447d934989ae7be447979705d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/98c818996296dd3447d934989ae7be447979705d",
+ "reference": "98c818996296dd3447d934989ae7be447979705d",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2.9",
+ "symfony/polyfill-mbstring": "~1.0"
+ },
+ "conflict": {
+ "phpunit/phpunit": "<5.4.3",
+ "symfony/console": "<4.4"
+ },
+ "require-dev": {
+ "ext-iconv": "*",
+ "symfony/console": "^4.4|^5.0",
+ "symfony/process": "^4.4|^5.0",
+ "twig/twig": "^2.4|^3.0"
+ },
+ "suggest": {
+ "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
+ "ext-intl": "To show region name in time zone dump",
+ "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
+ },
+ "bin": [
+ "Resources/bin/var-dump-server"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "5.0-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "Resources/functions/dump.php"
+ ],
+ "psr-4": {
+ "Symfony\\Component\\VarDumper\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony mechanism for exploring and dumping PHP variables",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "debug",
+ "dump"
+ ],
+ "time": "2019-11-12T14:58:10+00:00"
},
{
"name": "symfony/yaml",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "8caed6e8ff735a962ec032373a8c01493d69acca"
+ "reference": "76de473358fe802578a415d5bb43c296cf09d211"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/8caed6e8ff735a962ec032373a8c01493d69acca",
- "reference": "8caed6e8ff735a962ec032373a8c01493d69acca",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/76de473358fe802578a415d5bb43c296cf09d211",
+ "reference": "76de473358fe802578a415d5bb43c296cf09d211",
"shasum": ""
},
"require": {
@@ -3499,7 +3504,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2019-10-17T12:23:42+00:00"
+ "time": "2019-11-12T14:51:11+00:00"
},
{
"name": "twig/twig",
@@ -6243,16 +6248,16 @@
},
{
"name": "symfony/browser-kit",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
- "reference": "eeade4030711b065c2c690e5f9846c69e01cf247"
+ "reference": "e19e465c055137938afd40cfddd687e7511bbbf0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/browser-kit/zipball/eeade4030711b065c2c690e5f9846c69e01cf247",
- "reference": "eeade4030711b065c2c690e5f9846c69e01cf247",
+ "url": "https://api.github.com/repos/symfony/browser-kit/zipball/e19e465c055137938afd40cfddd687e7511bbbf0",
+ "reference": "e19e465c055137938afd40cfddd687e7511bbbf0",
"shasum": ""
},
"require": {
@@ -6298,20 +6303,20 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
- "time": "2019-09-27T05:43:04+00:00"
+ "time": "2019-10-28T20:30:34+00:00"
},
{
"name": "symfony/css-selector",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "1f8fa58d9b3e64d46fbf66681b621125642ba203"
+ "reference": "64acec7e0d67125e9f4656c68d4a38a42ab5a0b7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/1f8fa58d9b3e64d46fbf66681b621125642ba203",
- "reference": "1f8fa58d9b3e64d46fbf66681b621125642ba203",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/64acec7e0d67125e9f4656c68d4a38a42ab5a0b7",
+ "reference": "64acec7e0d67125e9f4656c68d4a38a42ab5a0b7",
"shasum": ""
},
"require": {
@@ -6351,20 +6356,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2019-10-02T08:48:21+00:00"
+ "time": "2019-10-12T00:35:04+00:00"
},
{
"name": "symfony/dom-crawler",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "0961866cf457cda10838e052d65e712417ad864c"
+ "reference": "36bbcab9369fc2f583220890efd43bf262d563fd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/0961866cf457cda10838e052d65e712417ad864c",
- "reference": "0961866cf457cda10838e052d65e712417ad864c",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/36bbcab9369fc2f583220890efd43bf262d563fd",
+ "reference": "36bbcab9369fc2f583220890efd43bf262d563fd",
"shasum": ""
},
"require": {
@@ -6412,20 +6417,20 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2019-10-09T13:24:13+00:00"
+ "time": "2019-10-29T11:38:30+00:00"
},
{
"name": "symfony/filesystem",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "f903e39aca6b4a4a2dbc473a1287b79b6c41cfb8"
+ "reference": "d12b01cba60be77b583c9af660007211e3909854"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/f903e39aca6b4a4a2dbc473a1287b79b6c41cfb8",
- "reference": "f903e39aca6b4a4a2dbc473a1287b79b6c41cfb8",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/d12b01cba60be77b583c9af660007211e3909854",
+ "reference": "d12b01cba60be77b583c9af660007211e3909854",
"shasum": ""
},
"require": {
@@ -6462,20 +6467,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2019-09-16T08:12:51+00:00"
+ "time": "2019-11-12T14:51:11+00:00"
},
{
"name": "symfony/finder",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "30898bbac041d71f18862366a7a0987dd5cff7dd"
+ "reference": "d2be8f79d8abebeafd87cfb9ec656ecb27dfd873"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/30898bbac041d71f18862366a7a0987dd5cff7dd",
- "reference": "30898bbac041d71f18862366a7a0987dd5cff7dd",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/d2be8f79d8abebeafd87cfb9ec656ecb27dfd873",
+ "reference": "d2be8f79d8abebeafd87cfb9ec656ecb27dfd873",
"shasum": ""
},
"require": {
@@ -6511,28 +6516,31 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2019-09-17T11:12:18+00:00"
+ "time": "2019-10-30T12:55:29+00:00"
},
{
"name": "symfony/lock",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/lock.git",
- "reference": "03d9a1d56b1b12204f4264d50832a96df687b0da"
+ "reference": "6eca6ef15a5feef9855fdfe25a26c7096f0be351"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/lock/zipball/03d9a1d56b1b12204f4264d50832a96df687b0da",
- "reference": "03d9a1d56b1b12204f4264d50832a96df687b0da",
+ "url": "https://api.github.com/repos/symfony/lock/zipball/6eca6ef15a5feef9855fdfe25a26c7096f0be351",
+ "reference": "6eca6ef15a5feef9855fdfe25a26c7096f0be351",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"psr/log": "~1.0"
},
+ "conflict": {
+ "doctrine/dbal": "<2.5"
+ },
"require-dev": {
- "doctrine/dbal": "~2.4",
+ "doctrine/dbal": "~2.5",
"mongodb/mongodb": "~1.1",
"predis/predis": "~1.0"
},
@@ -6574,20 +6582,20 @@
"redlock",
"semaphore"
],
- "time": "2019-10-03T11:24:03+00:00"
+ "time": "2019-11-11T13:09:26+00:00"
},
{
"name": "symfony/phpunit-bridge",
- "version": "4.4.x-dev",
+ "version": "v4.4.0-BETA2",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
- "reference": "ed7630d74a085f4513c3f9dd75f2a8585332a70c"
+ "reference": "7daa9d4a2f457f9cae32f1c2406de1921dc86a79"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/ed7630d74a085f4513c3f9dd75f2a8585332a70c",
- "reference": "ed7630d74a085f4513c3f9dd75f2a8585332a70c",
+ "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/7daa9d4a2f457f9cae32f1c2406de1921dc86a79",
+ "reference": "7daa9d4a2f457f9cae32f1c2406de1921dc86a79",
"shasum": ""
},
"require": {
@@ -6639,7 +6647,7 @@
],
"description": "Symfony PHPUnit Bridge",
"homepage": "https://symfony.com",
- "time": "2019-10-02T08:48:21+00:00"
+ "time": "2019-11-08T15:59:14+00:00"
},
{
"name": "theseer/tokenizer",
diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json
index fabe0c14b6e40e45def86e80684ec2c472ba0610..4e6eb3d609d7d76b438b236151a05a11f696bba2 100644
--- a/composer/Metapackage/CoreRecommended/composer.json
+++ b/composer/Metapackage/CoreRecommended/composer.json
@@ -33,32 +33,32 @@
"ralouphie/getallheaders": "3.0.3",
"stack/builder": "v1.0.5",
"symfony-cmf/routing": "2.1.0",
- "symfony/class-loader": "v3.4.32",
- "symfony/console": "4.4.x-dev",
- "symfony/debug": "4.4.x-dev",
- "symfony/dependency-injection": "4.4.x-dev",
- "symfony/error-handler": "dev-master",
- "symfony/error-renderer": "4.4.x-dev",
- "symfony/event-dispatcher": "4.4.x-dev",
+ "symfony/class-loader": "v3.4.35",
+ "symfony/console": "v4.4.0-BETA2",
+ "symfony/debug": "v4.4.0-BETA2",
+ "symfony/dependency-injection": "v4.4.0-BETA2",
+ "symfony/error-handler": "v4.4.0-BETA2",
+ "symfony/event-dispatcher": "v4.4.0-BETA2",
"symfony/event-dispatcher-contracts": "v1.1.7",
- "symfony/http-foundation": "4.4.x-dev",
- "symfony/http-kernel": "4.4.x-dev",
- "symfony/mime": "v4.3.5",
+ "symfony/http-foundation": "v4.4.0-BETA2",
+ "symfony/http-kernel": "v4.4.0-BETA2",
+ "symfony/mime": "v4.3.8",
"symfony/polyfill-ctype": "v1.12.0",
"symfony/polyfill-iconv": "v1.12.0",
"symfony/polyfill-intl-idn": "v1.12.0",
"symfony/polyfill-mbstring": "v1.12.0",
"symfony/polyfill-php72": "v1.12.0",
"symfony/polyfill-php73": "v1.12.0",
- "symfony/process": "4.4.x-dev",
+ "symfony/process": "v4.4.0-BETA2",
"symfony/psr-http-message-bridge": "v1.2.0",
- "symfony/routing": "4.4.x-dev",
- "symfony/serializer": "4.4.x-dev",
- "symfony/service-contracts": "v1.1.7",
- "symfony/translation": "4.4.x-dev",
- "symfony/translation-contracts": "v1.1.7",
- "symfony/validator": "4.4.x-dev",
- "symfony/yaml": "4.4.x-dev",
+ "symfony/routing": "v4.4.0-BETA2",
+ "symfony/serializer": "v4.4.0-BETA2",
+ "symfony/service-contracts": "v2.0.0",
+ "symfony/translation": "v4.4.0-BETA2",
+ "symfony/translation-contracts": "v2.0.0",
+ "symfony/validator": "v4.4.0-BETA2",
+ "symfony/var-dumper": "v5.0.0-BETA2",
+ "symfony/yaml": "v4.4.0-BETA2",
"twig/twig": "v2.12.1",
"typo3/phar-stream-wrapper": "v3.1.3",
"zendframework/zend-diactoros": "1.8.7",
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index 689b3c55f5e6940dfde679c62e88524cdc9e43cc..4414f639ed9389f412c2f709642fd9380d2b4ef9 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -52,13 +52,13 @@
"seld/jsonlint": "1.7.1",
"seld/phar-utils": "1.0.1",
"squizlabs/php_codesniffer": "3.5.0",
- "symfony/browser-kit": "4.4.x-dev",
- "symfony/css-selector": "4.4.x-dev",
- "symfony/dom-crawler": "4.4.x-dev",
- "symfony/filesystem": "4.4.x-dev",
- "symfony/finder": "4.4.x-dev",
- "symfony/lock": "4.4.x-dev",
- "symfony/phpunit-bridge": "4.4.x-dev",
+ "symfony/browser-kit": "v4.4.0-BETA2",
+ "symfony/css-selector": "v4.4.0-BETA2",
+ "symfony/dom-crawler": "v4.4.0-BETA2",
+ "symfony/filesystem": "v4.4.0-BETA2",
+ "symfony/finder": "v4.4.0-BETA2",
+ "symfony/lock": "v4.4.0-BETA2",
+ "symfony/phpunit-bridge": "v4.4.0-BETA2",
"theseer/tokenizer": "1.1.3",
"webmozart/assert": "1.5.0"
}
diff --git a/core/lib/Drupal/Core/EventSubscriber/AuthenticationSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/AuthenticationSubscriber.php
index d8d0da74e517817799ed16479dbc8ac4801b6bd8..84ecd9fdb16429d4fa6f1c29f6bbf9734454aae4 100644
--- a/core/lib/Drupal/Core/EventSubscriber/AuthenticationSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/AuthenticationSubscriber.php
@@ -111,11 +111,11 @@ public function onKernelRequestFilterProvider(GetResponseEvent $event) {
public function onExceptionSendChallenge(GetResponseForExceptionEvent $event) {
if (isset($this->challengeProvider) && $event->isMasterRequest()) {
$request = $event->getRequest();
- $exception = $event->getException();
+ $exception = $event->getThrowable();
if ($exception instanceof AccessDeniedHttpException && !$this->authenticationProvider->applies($request) && (!isset($this->filter) || $this->filter->appliesToRoutedRequest($request, FALSE))) {
$challenge_exception = $this->challengeProvider->challengeException($request, $exception);
if ($challenge_exception) {
- $event->setException($challenge_exception);
+ $event->setThrowable($challenge_exception);
}
}
}
@@ -129,9 +129,9 @@ public function onExceptionSendChallenge(GetResponseForExceptionEvent $event) {
public function onExceptionAccessDenied(GetResponseForExceptionEvent $event) {
if (isset($this->filter) && $event->isMasterRequest()) {
$request = $event->getRequest();
- $exception = $event->getException();
+ $exception = $event->getThrowable();
if ($exception instanceof AccessDeniedHttpException && $this->authenticationProvider->applies($request) && !$this->filter->appliesToRoutedRequest($request, TRUE)) {
- $event->setException(new AccessDeniedHttpException('The used authentication method is not allowed on this route.', $exception));
+ $event->setThrowable(new AccessDeniedHttpException('The used authentication method is not allowed on this route.', $exception));
}
}
}
diff --git a/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionHtmlSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionHtmlSubscriber.php
index 8812583b66c855c1a3fa34b638e4b32fb02f19f5..03eebdc7d196fcef9eef97bcdd68af5089852a86 100644
--- a/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionHtmlSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionHtmlSubscriber.php
@@ -87,7 +87,7 @@ protected function getHandledFormats() {
* The event to process.
*/
public function on4xx(GetResponseForExceptionEvent $event) {
- if (($exception = $event->getException()) && $exception instanceof HttpExceptionInterface) {
+ if (($exception = $event->getThrowable()) && $exception instanceof HttpExceptionInterface) {
$this->makeSubrequest($event, '/system/4xx', $exception->getStatusCode());
}
}
@@ -134,7 +134,7 @@ public function on404(GetResponseForExceptionEvent $event) {
*/
protected function makeSubrequest(GetResponseForExceptionEvent $event, $url, $status_code) {
$request = $event->getRequest();
- $exception = $event->getException();
+ $exception = $event->getThrowable();
try {
// Reuse the exact same request (so keep the same URL, keep the access
diff --git a/core/lib/Drupal/Core/EventSubscriber/EnforcedFormResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/EnforcedFormResponseSubscriber.php
index 353f02e807dff6525ce9af5ea4dfd4490db34fcf..fdf2bc6086eb81c944c064cad167bdd13d4e65a8 100644
--- a/core/lib/Drupal/Core/EventSubscriber/EnforcedFormResponseSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/EnforcedFormResponseSubscriber.php
@@ -17,7 +17,7 @@ class EnforcedFormResponseSubscriber implements EventSubscriberInterface {
* Replaces the response in case an EnforcedResponseException was thrown.
*/
public function onKernelException(GetResponseForExceptionEvent $event) {
- if ($response = EnforcedResponse::createFromException($event->getException())) {
+ if ($response = EnforcedResponse::createFromException($event->getThrowable())) {
// Setting the response stops the event propagation.
$event->setResponse($response);
}
diff --git a/core/lib/Drupal/Core/EventSubscriber/ExceptionDetectNeedsInstallSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ExceptionDetectNeedsInstallSubscriber.php
index 9b974f28e3f78bce0f8f8a585e1a82e28de7e5f1..1020d95a712cd617f06227223f61750f779c380e 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ExceptionDetectNeedsInstallSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ExceptionDetectNeedsInstallSubscriber.php
@@ -39,7 +39,7 @@ public function __construct(Connection $connection) {
* The event to process.
*/
public function onException(GetResponseForExceptionEvent $event) {
- $exception = $event->getException();
+ $exception = $event->getThrowable();
if ($this->shouldRedirectToInstaller($exception, $this->connection)) {
// Only redirect if this is an HTML response (i.e., a user trying to view
// the site in a web browser before installing it).
diff --git a/core/lib/Drupal/Core/EventSubscriber/ExceptionJsonSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ExceptionJsonSubscriber.php
index 239e5821160fbed84ca38c0ea17db921a186b7fa..618ec346d1a753811d4fd9b939c41b712c075c81 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ExceptionJsonSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ExceptionJsonSubscriber.php
@@ -36,15 +36,15 @@ protected static function getPriority() {
*/
public function on4xx(GetResponseForExceptionEvent $event) {
/** @var \Symfony\Component\HttpKernel\Exception\HttpExceptionInterface $exception */
- $exception = $event->getException();
+ $exception = $event->getThrowable();
// If the exception is cacheable, generate a cacheable response.
if ($exception instanceof CacheableDependencyInterface) {
- $response = new CacheableJsonResponse(['message' => $event->getException()->getMessage()], $exception->getStatusCode(), $exception->getHeaders());
+ $response = new CacheableJsonResponse(['message' => $event->getThrowable()->getMessage()], $exception->getStatusCode(), $exception->getHeaders());
$response->addCacheableDependency($exception);
}
else {
- $response = new JsonResponse(['message' => $event->getException()->getMessage()], $exception->getStatusCode(), $exception->getHeaders());
+ $response = new JsonResponse(['message' => $event->getThrowable()->getMessage()], $exception->getStatusCode(), $exception->getHeaders());
}
$event->setResponse($response);
diff --git a/core/lib/Drupal/Core/EventSubscriber/ExceptionLoggingSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ExceptionLoggingSubscriber.php
index e7b4ba4fcd5c7184b5104e994cea01ef214f3cfe..7ad38972dd563c6d0f9f224afc7722ec385f6a17 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ExceptionLoggingSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ExceptionLoggingSubscriber.php
@@ -60,7 +60,7 @@ public function on404(GetResponseForExceptionEvent $event) {
* The event to process.
*/
public function onError(GetResponseForExceptionEvent $event) {
- $exception = $event->getException();
+ $exception = $event->getThrowable();
$error = Error::decodeException($exception);
$this->logger->get('php')->log($error['severity_level'], '%type: @message in %function (line %line of %file).', $error);
@@ -77,7 +77,7 @@ public function onError(GetResponseForExceptionEvent $event) {
* The event to process.
*/
public function onException(GetResponseForExceptionEvent $event) {
- $exception = $event->getException();
+ $exception = $event->getThrowable();
$method = 'onError';
diff --git a/core/lib/Drupal/Core/EventSubscriber/ExceptionTestSiteSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ExceptionTestSiteSubscriber.php
index ab50f217ada3388977b098f2fd1c3f102ac0f546..dd65cde76f9889b372da1ebdcf8525ec270e6bb4 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ExceptionTestSiteSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ExceptionTestSiteSubscriber.php
@@ -34,7 +34,7 @@ protected function getHandledFormats() {
* @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
*/
public function on500(GetResponseForExceptionEvent $event) {
- $exception = $event->getException();
+ $exception = $event->getThrowable();
$error = Error::decodeException($exception);
$headers = [];
diff --git a/core/lib/Drupal/Core/EventSubscriber/FinalExceptionSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/FinalExceptionSubscriber.php
index 186be771c9d3d307b34a5964593c53772eb362ef..cfa191e0c5bfcaf6581ccfeb3d6a0b7cd7481ad1 100644
--- a/core/lib/Drupal/Core/EventSubscriber/FinalExceptionSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/FinalExceptionSubscriber.php
@@ -77,7 +77,7 @@ protected function getErrorLevel() {
* The event to process.
*/
public function onException(GetResponseForExceptionEvent $event) {
- $exception = $event->getException();
+ $exception = $event->getThrowable();
$error = Error::decodeException($exception);
// Display the message if the current error reporting level allows this type
diff --git a/core/lib/Drupal/Core/EventSubscriber/HttpExceptionSubscriberBase.php b/core/lib/Drupal/Core/EventSubscriber/HttpExceptionSubscriberBase.php
index f286c009da4e5894111c13411bb29cfd12f4ca49..c431bdf605ea1f1a181ae0273c4a8dd002261207 100644
--- a/core/lib/Drupal/Core/EventSubscriber/HttpExceptionSubscriberBase.php
+++ b/core/lib/Drupal/Core/EventSubscriber/HttpExceptionSubscriberBase.php
@@ -86,7 +86,7 @@ protected static function getPriority() {
* The event to process.
*/
public function onException(GetResponseForExceptionEvent $event) {
- $exception = $event->getException();
+ $exception = $event->getThrowable();
// Make the exception available for example when rendering a block.
$request = $event->getRequest();
diff --git a/core/lib/Drupal/Core/Form/EventSubscriber/FormAjaxSubscriber.php b/core/lib/Drupal/Core/Form/EventSubscriber/FormAjaxSubscriber.php
index c94a1bfa93048e06053cd32d74cb488268ee6429..d9f92487b356a70710253e1f4232c40530c30fed 100644
--- a/core/lib/Drupal/Core/Form/EventSubscriber/FormAjaxSubscriber.php
+++ b/core/lib/Drupal/Core/Form/EventSubscriber/FormAjaxSubscriber.php
@@ -80,7 +80,7 @@ public function onView(GetResponseForControllerResultEvent $event) {
* The event to process.
*/
public function onException(GetResponseForExceptionEvent $event) {
- $exception = $event->getException();
+ $exception = $event->getThrowable();
$request = $event->getRequest();
// Render a nice error message in case we have a file upload which exceeds
@@ -116,7 +116,7 @@ public function onException(GetResponseForExceptionEvent $event) {
}
catch (\Exception $e) {
// Otherwise, replace the existing exception with the new one.
- $event->setException($e);
+ $event->setThrowable($e);
}
}
}
diff --git a/core/lib/Drupal/Core/Routing/Enhancer/ParamConversionEnhancer.php b/core/lib/Drupal/Core/Routing/Enhancer/ParamConversionEnhancer.php
index 212839dec00b125a27e790e3341fc5d3d07e0ba9..332b905b539e9a4acd9952f31d2993f69b82308f 100644
--- a/core/lib/Drupal/Core/Routing/Enhancer/ParamConversionEnhancer.php
+++ b/core/lib/Drupal/Core/Routing/Enhancer/ParamConversionEnhancer.php
@@ -75,9 +75,9 @@ protected function copyRawVariables(array $defaults) {
* @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
*/
public function onException(GetResponseForExceptionEvent $event) {
- $exception = $event->getException();
+ $exception = $event->getThrowable();
if ($exception instanceof ParamNotConvertedException) {
- $event->setException(new NotFoundHttpException($exception->getMessage(), $exception));
+ $event->setThrowable(new NotFoundHttpException($exception->getMessage(), $exception));
}
}
diff --git a/core/modules/jsonapi/src/EventSubscriber/DefaultExceptionSubscriber.php b/core/modules/jsonapi/src/EventSubscriber/DefaultExceptionSubscriber.php
index 0220ef55dda15d36e50b48dacd5a21ada5fb42da..6151b82f6de374fe9f5b74dfad1e0a62e88b5c66 100644
--- a/core/modules/jsonapi/src/EventSubscriber/DefaultExceptionSubscriber.php
+++ b/core/modules/jsonapi/src/EventSubscriber/DefaultExceptionSubscriber.php
@@ -44,9 +44,9 @@ public function onException(GetResponseForExceptionEvent $event) {
if (!$this->isJsonApiExceptionEvent($event)) {
return;
}
- if (($exception = $event->getException()) && !$exception instanceof HttpException) {
+ if (($exception = $event->getThrowable()) && !$exception instanceof HttpException) {
$exception = new HttpException(500, $exception->getMessage(), $exception);
- $event->setException($exception);
+ $event->setThrowable($exception);
}
$this->setEventResponse($event, $exception->getStatusCode());
@@ -57,7 +57,7 @@ public function onException(GetResponseForExceptionEvent $event) {
*/
protected function setEventResponse(GetResponseForExceptionEvent $event, $status) {
/* @var \Symfony\Component\HttpKernel\Exception\HttpException $exception */
- $exception = $event->getException();
+ $exception = $event->getThrowable();
$response = new ResourceResponse(new JsonApiDocumentTopLevel(new ErrorCollection([$exception]), new NullIncludedData(), new LinkCollection([])), $exception->getStatusCode(), $exception->getHeaders());
$response->addCacheableDependency($exception);
$event->setResponse($response);
diff --git a/core/modules/node/src/EventSubscriber/NodeTranslationExceptionSubscriber.php b/core/modules/node/src/EventSubscriber/NodeTranslationExceptionSubscriber.php
index 795670fc159f13cf97d2333ce551fcfee0fea362..9801acf3a772c598a4d5ebfe7996a43a924a15ee 100644
--- a/core/modules/node/src/EventSubscriber/NodeTranslationExceptionSubscriber.php
+++ b/core/modules/node/src/EventSubscriber/NodeTranslationExceptionSubscriber.php
@@ -84,7 +84,7 @@ public function __construct(KeyValueFactoryInterface $key_value, LanguageManager
* The exception event.
*/
public function onException(GetResponseForExceptionEvent $event) {
- $exception = $event->getException();
+ $exception = $event->getThrowable();
// If this is not a 404, we don't need to check for a redirection.
if (!($exception instanceof NotFoundHttpException)) {
diff --git a/core/modules/serialization/src/EventSubscriber/DefaultExceptionSubscriber.php b/core/modules/serialization/src/EventSubscriber/DefaultExceptionSubscriber.php
index 80b8730308cb344df32d6538ce02bfd1695d140a..1f1e538df17ba4c0d028a3fefa8ea0d6eb8487c2 100644
--- a/core/modules/serialization/src/EventSubscriber/DefaultExceptionSubscriber.php
+++ b/core/modules/serialization/src/EventSubscriber/DefaultExceptionSubscriber.php
@@ -69,7 +69,7 @@ protected static function getPriority() {
*/
public function on4xx(GetResponseForExceptionEvent $event) {
/** @var \Symfony\Component\HttpKernel\Exception\HttpExceptionInterface $exception */
- $exception = $event->getException();
+ $exception = $event->getThrowable();
$request = $event->getRequest();
$format = $request->getRequestFormat();
diff --git a/core/modules/user/src/EventSubscriber/AccessDeniedSubscriber.php b/core/modules/user/src/EventSubscriber/AccessDeniedSubscriber.php
index d443effc302a24ff87baad85c03b84f2beb614c6..b0ee2d23e04cc54a8773ca06eafb49c8305d386e 100644
--- a/core/modules/user/src/EventSubscriber/AccessDeniedSubscriber.php
+++ b/core/modules/user/src/EventSubscriber/AccessDeniedSubscriber.php
@@ -45,7 +45,7 @@ public function __construct(AccountInterface $account) {
* The event to process.
*/
public function onException(GetResponseForExceptionEvent $event) {
- $exception = $event->getException();
+ $exception = $event->getThrowable();
if ($exception instanceof AccessDeniedHttpException) {
$route_name = RouteMatch::createFromRequest($event->getRequest())->getRouteName();
$redirect_url = NULL;
diff --git a/core/tests/Drupal/Tests/Core/Form/EventSubscriber/FormAjaxSubscriberTest.php b/core/tests/Drupal/Tests/Core/Form/EventSubscriber/FormAjaxSubscriberTest.php
index 89f36883b43905839022670f444a25cdca5e060e..f57594baad7657a0f6edf662e68d33a392281b1f 100644
--- a/core/tests/Drupal/Tests/Core/Form/EventSubscriber/FormAjaxSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/EventSubscriber/FormAjaxSubscriberTest.php
@@ -147,7 +147,7 @@ public function testOnExceptionResponseBuilderException() {
->willThrowException($expected_exception);
$event = $this->assertResponseFromException($request, $exception, NULL);
- $this->assertSame($expected_exception, $event->getException());
+ $this->assertSame($expected_exception, $event->getThrowable());
}
/**
diff --git a/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php b/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
index 05ec56c595983ca8c5211d57dbc6938549ba8988..9d3d49ed51c734158e4e072624c7ef7cef39a713 100644
--- a/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
+++ b/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
@@ -199,6 +199,7 @@ public static function getSkippedDeprecations() {
'The \Drupal\Core\Path\AliasManager class is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Instead, use \Drupal\path_alias\AliasManager. See https://drupal.org/node/3092086',
'The \Drupal\Core\Path\AliasRepository class is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Instead, use \Drupal\path_alias\AliasRepository. See https://drupal.org/node/3092086',
'The \Drupal\Core\Path\AliasWhitelist class is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Instead, use \Drupal\path_alias\AliasWhitelist. See https://drupal.org/node/3092086',
+ '"Symfony\Component\DomCrawler\Crawler::text()" will normalize whitespaces by default in Symfony 5.0, set the second "$normalizeWhitespace" argument to false to retrieve the non-normalized version of the text.',
];
}