Unverified Commit 35bbac2b authored by alexpott's avatar alexpott
Browse files

Issue #3088754 by mikelutz, alexpott, Eric_A, catch, Krzysztof Domański:...

Issue #3088754 by mikelutz, alexpott, Eric_A, catch, Krzysztof Domański: Update to Drupal 9 to Symfony 4.4.0
parent a6477d59
......@@ -1876,7 +1876,7 @@
},
{
"name": "symfony/console",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
......@@ -1952,7 +1952,7 @@
},
{
"name": "symfony/debug",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
......@@ -2008,16 +2008,16 @@
},
{
"name": "symfony/dependency-injection",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
"reference": "3402ac9d27a88dde024694defce28329034c96f7"
"reference": "d4439814135ed1343c93bde998b7792af8852e41"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/3402ac9d27a88dde024694defce28329034c96f7",
"reference": "3402ac9d27a88dde024694defce28329034c96f7",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d4439814135ed1343c93bde998b7792af8852e41",
"reference": "d4439814135ed1343c93bde998b7792af8852e41",
"shasum": ""
},
"require": {
......@@ -2077,20 +2077,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
"time": "2019-11-12T14:51:11+00:00"
"time": "2019-11-20T13:27:43+00:00"
},
{
"name": "symfony/error-handler",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
"reference": "ee9121938fea18b0898a39aa5307ae3657b21abc"
"reference": "e1acb58dc6a8722617fe56565f742bcf7e8744bf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/ee9121938fea18b0898a39aa5307ae3657b21abc",
"reference": "ee9121938fea18b0898a39aa5307ae3657b21abc",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/e1acb58dc6a8722617fe56565f742bcf7e8744bf",
"reference": "e1acb58dc6a8722617fe56565f742bcf7e8744bf",
"shasum": ""
},
"require": {
......@@ -2133,11 +2133,11 @@
],
"description": "Symfony ErrorHandler Component",
"homepage": "https://symfony.com",
"time": "2019-11-12T17:18:47+00:00"
"time": "2019-11-17T22:49:13+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
......@@ -2265,16 +2265,16 @@
},
{
"name": "symfony/http-foundation",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "e6e2b4e3fc2b25724701235ed5a9065da0bd06a8"
"reference": "502040dd2b0cf0a292defeb6145f4d7a4753c99c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/e6e2b4e3fc2b25724701235ed5a9065da0bd06a8",
"reference": "e6e2b4e3fc2b25724701235ed5a9065da0bd06a8",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/502040dd2b0cf0a292defeb6145f4d7a4753c99c",
"reference": "502040dd2b0cf0a292defeb6145f4d7a4753c99c",
"shasum": ""
},
"require": {
......@@ -2316,20 +2316,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"time": "2019-11-13T07:39:40+00:00"
"time": "2019-11-17T10:10:42+00:00"
},
{
"name": "symfony/http-kernel",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "d84a893b30ffad14bcea86d7f09c408c82858027"
"reference": "5a5e7237d928aa98ff8952050cbbf0135899b6b0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/d84a893b30ffad14bcea86d7f09c408c82858027",
"reference": "d84a893b30ffad14bcea86d7f09c408c82858027",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/5a5e7237d928aa98ff8952050cbbf0135899b6b0",
"reference": "5a5e7237d928aa98ff8952050cbbf0135899b6b0",
"shasum": ""
},
"require": {
......@@ -2406,35 +2406,38 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"time": "2019-11-13T09:13:36+00:00"
"time": "2019-11-21T07:08:15+00:00"
},
{
"name": "symfony/mime",
"version": "v4.3.8",
"version": "v5.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "22aecf6b11638ef378fab25d6c5a2da8a31a1448"
"reference": "76f3c09b7382bf979af7bcd8e6f8033f1324285e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/22aecf6b11638ef378fab25d6c5a2da8a31a1448",
"reference": "22aecf6b11638ef378fab25d6c5a2da8a31a1448",
"url": "https://api.github.com/repos/symfony/mime/zipball/76f3c09b7382bf979af7bcd8e6f8033f1324285e",
"reference": "76f3c09b7382bf979af7bcd8e6f8033f1324285e",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"php": "^7.2.5",
"symfony/polyfill-intl-idn": "^1.10",
"symfony/polyfill-mbstring": "^1.0"
},
"conflict": {
"symfony/mailer": "<4.4"
},
"require-dev": {
"egulias/email-validator": "^2.1.10",
"symfony/dependency-injection": "~3.4|^4.1"
"symfony/dependency-injection": "^4.4|^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.3-dev"
"dev-master": "5.0-dev"
}
},
"autoload": {
......@@ -2465,7 +2468,7 @@
"mime",
"mime-type"
],
"time": "2019-11-12T13:10:02+00:00"
"time": "2019-11-18T17:27:11+00:00"
},
{
"name": "symfony/polyfill-ctype",
......@@ -2820,7 +2823,7 @@
},
{
"name": "symfony/process",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
......@@ -2869,26 +2872,26 @@
},
{
"name": "symfony/psr-http-message-bridge",
"version": "v1.2.0",
"version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/psr-http-message-bridge.git",
"reference": "9ab9d71f97d5c7d35a121a7fb69f74fee95cd0ad"
"reference": "9d3e80d54d9ae747ad573cad796e8e247df7b796"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/9ab9d71f97d5c7d35a121a7fb69f74fee95cd0ad",
"reference": "9ab9d71f97d5c7d35a121a7fb69f74fee95cd0ad",
"url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/9d3e80d54d9ae747ad573cad796e8e247df7b796",
"reference": "9d3e80d54d9ae747ad573cad796e8e247df7b796",
"shasum": ""
},
"require": {
"php": "^7.1",
"psr/http-message": "^1.0",
"symfony/http-foundation": "^3.4 || ^4.0"
"symfony/http-foundation": "^4.4 || ^5.0"
},
"require-dev": {
"nyholm/psr7": "^1.1",
"symfony/phpunit-bridge": "^3.4.20 || ^4.0",
"symfony/phpunit-bridge": "^4.4 || ^5.0",
"zendframework/zend-diactoros": "^1.4.1 || ^2.0"
},
"suggest": {
......@@ -2897,7 +2900,7 @@
"type": "symfony-bridge",
"extra": {
"branch-alias": {
"dev-master": "1.2-dev"
"dev-master": "1.3-dev"
}
},
"autoload": {
......@@ -2913,13 +2916,13 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
}
],
"description": "PSR HTTP message bridge",
......@@ -2930,20 +2933,20 @@
"psr-17",
"psr-7"
],
"time": "2019-03-11T18:22:33+00:00"
"time": "2019-11-25T19:33:50+00:00"
},
{
"name": "symfony/routing",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "99876ba2ac4fd8fa07db6b3cf3db2ab3aa0caa6a"
"reference": "cf6d72cf0348775f5243b8389169a7096221ea40"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/99876ba2ac4fd8fa07db6b3cf3db2ab3aa0caa6a",
"reference": "99876ba2ac4fd8fa07db6b3cf3db2ab3aa0caa6a",
"url": "https://api.github.com/repos/symfony/routing/zipball/cf6d72cf0348775f5243b8389169a7096221ea40",
"reference": "cf6d72cf0348775f5243b8389169a7096221ea40",
"shasum": ""
},
"require": {
......@@ -3006,11 +3009,11 @@
"uri",
"url"
],
"time": "2019-11-12T14:51:11+00:00"
"time": "2019-11-20T13:44:34+00:00"
},
{
"name": "symfony/serializer",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/serializer.git",
......@@ -3149,7 +3152,7 @@
},
{
"name": "symfony/translation",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
......@@ -3282,7 +3285,7 @@
},
{
"name": "symfony/validator",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/validator.git",
......@@ -3374,20 +3377,20 @@
},
{
"name": "symfony/var-dumper",
"version": "v5.0.0-BETA2",
"version": "v5.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "98c818996296dd3447d934989ae7be447979705d"
"reference": "956b8b6e4c52186695f592286414601abfcec284"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/98c818996296dd3447d934989ae7be447979705d",
"reference": "98c818996296dd3447d934989ae7be447979705d",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/956b8b6e4c52186695f592286414601abfcec284",
"reference": "956b8b6e4c52186695f592286414601abfcec284",
"shasum": ""
},
"require": {
"php": "^7.2.9",
"php": "^7.2.5",
"symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
......@@ -3445,11 +3448,11 @@
"debug",
"dump"
],
"time": "2019-11-12T14:58:10+00:00"
"time": "2019-11-18T17:27:11+00:00"
},
{
"name": "symfony/yaml",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
......@@ -6248,7 +6251,7 @@
},
{
"name": "symfony/browser-kit",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
......@@ -6307,7 +6310,7 @@
},
{
"name": "symfony/css-selector",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
......@@ -6360,7 +6363,7 @@
},
{
"name": "symfony/dom-crawler",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
......@@ -6421,7 +6424,7 @@
},
{
"name": "symfony/filesystem",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
......@@ -6471,16 +6474,16 @@
},
{
"name": "symfony/finder",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "d2be8f79d8abebeafd87cfb9ec656ecb27dfd873"
"reference": "ce8743441da64c41e2a667b8eb66070444ed911e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/d2be8f79d8abebeafd87cfb9ec656ecb27dfd873",
"reference": "d2be8f79d8abebeafd87cfb9ec656ecb27dfd873",
"url": "https://api.github.com/repos/symfony/finder/zipball/ce8743441da64c41e2a667b8eb66070444ed911e",
"reference": "ce8743441da64c41e2a667b8eb66070444ed911e",
"shasum": ""
},
"require": {
......@@ -6516,11 +6519,11 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2019-10-30T12:55:29+00:00"
"time": "2019-11-17T21:56:56+00:00"
},
{
"name": "symfony/lock",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/lock.git",
......@@ -6586,7 +6589,7 @@
},
{
"name": "symfony/phpunit-bridge",
"version": "v4.4.0-BETA2",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
......
......@@ -34,31 +34,31 @@
"stack/builder": "v1.0.5",
"symfony-cmf/routing": "2.1.0",
"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/console": "v4.4.0",
"symfony/debug": "v4.4.0",
"symfony/dependency-injection": "v4.4.0",
"symfony/error-handler": "v4.4.0",
"symfony/event-dispatcher": "v4.4.0",
"symfony/event-dispatcher-contracts": "v1.1.7",
"symfony/http-foundation": "v4.4.0-BETA2",
"symfony/http-kernel": "v4.4.0-BETA2",
"symfony/mime": "v4.3.8",
"symfony/http-foundation": "v4.4.0",
"symfony/http-kernel": "v4.4.0",
"symfony/mime": "v5.0.0",
"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": "v4.4.0-BETA2",
"symfony/psr-http-message-bridge": "v1.2.0",
"symfony/routing": "v4.4.0-BETA2",
"symfony/serializer": "v4.4.0-BETA2",
"symfony/process": "v4.4.0",
"symfony/psr-http-message-bridge": "v1.3.0",
"symfony/routing": "v4.4.0",
"symfony/serializer": "v4.4.0",
"symfony/service-contracts": "v2.0.0",
"symfony/translation": "v4.4.0-BETA2",
"symfony/translation": "v4.4.0",
"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",
"symfony/validator": "v4.4.0",
"symfony/var-dumper": "v5.0.0",
"symfony/yaml": "v4.4.0",
"twig/twig": "v2.12.1",
"typo3/phar-stream-wrapper": "v3.1.3",
"zendframework/zend-diactoros": "1.8.7",
......
......@@ -52,13 +52,13 @@
"seld/jsonlint": "1.7.1",
"seld/phar-utils": "1.0.1",
"squizlabs/php_codesniffer": "3.5.0",
"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",
"symfony/browser-kit": "v4.4.0",
"symfony/css-selector": "v4.4.0",
"symfony/dom-crawler": "v4.4.0",
"symfony/filesystem": "v4.4.0",
"symfony/finder": "v4.4.0",
"symfony/lock": "v4.4.0",
"symfony/phpunit-bridge": "v4.4.0",
"theseer/tokenizer": "1.1.3",
"webmozart/assert": "1.5.0"
}
......
......@@ -527,7 +527,7 @@ protected function checkForMetaRefresh() {
if (!empty($refresh) && (!isset($this->maximumMetaRefreshCount) || $this->metaRefreshCount < $this->maximumMetaRefreshCount)) {
// Parse the content attribute of the meta tag for the format:
// "[delay]: URL=[page_to_redirect_to]".
if (preg_match('/\d+;\s*URL=(?<url>.*)/i', $refresh[0]->getAttribute('content'), $match)) {
if (preg_match('/\d+;\s*URL=\'?(?<url>[^\']*)/i', $refresh[0]->getAttribute('content'), $match)) {
$this->metaRefreshCount++;
return $this->drupalGet($this->getAbsoluteUrl(Html::decodeEntities($match['url'])));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment