diff --git a/composer.lock b/composer.lock index 37c95a8604..8726354571 100644 --- a/composer.lock +++ b/composer.lock @@ -485,7 +485,7 @@ "dist": { "type": "path", "url": "core", - "reference": "5bd6798a64831fa08a343a14a0ee47127c4cb99f" + "reference": "8b05c278f5cc7a2a150e8f3999e185110d56d334" }, "require": { "asm89/stack-cors": "^1.1", @@ -708,6 +708,9 @@ "lib/Drupal/Core/DrupalKernelInterface.php", "lib/Drupal/Core/Installer/InstallerRedirectTrait.php", "lib/Drupal/Core/Site/Settings.php" + ], + "files": [ + "includes/class_aliases.php" ] }, "scripts": { @@ -1984,7 +1987,7 @@ }, { "name": "symfony/console", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/console.git", @@ -2075,7 +2078,7 @@ }, { "name": "symfony/debug", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", @@ -2146,16 +2149,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "6a2cecd7011aec38b5fb2270abf0de120e7679b1" + "reference": "a37cc0a90fec178768aa5048fea9251efde591c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6a2cecd7011aec38b5fb2270abf0de120e7679b1", - "reference": "6a2cecd7011aec38b5fb2270abf0de120e7679b1", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a37cc0a90fec178768aa5048fea9251efde591c5", + "reference": "a37cc0a90fec178768aa5048fea9251efde591c5", "shasum": "" }, "require": { @@ -2229,11 +2232,11 @@ "type": "tidelift" } ], - "time": "2020-05-30T20:06:45+00:00" + "time": "2020-06-12T07:37:04+00:00" }, { "name": "symfony/error-handler", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", @@ -2304,7 +2307,7 @@ }, { "name": "symfony/event-dispatcher", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -2446,7 +2449,7 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", @@ -2515,16 +2518,16 @@ }, { "name": "symfony/http-kernel", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "54526b598d7fc86a67850488b194a88a79ab8467" + "reference": "81d42148474e1852a333ed7a732f2a014af75430" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/54526b598d7fc86a67850488b194a88a79ab8467", - "reference": "54526b598d7fc86a67850488b194a88a79ab8467", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/81d42148474e1852a333ed7a732f2a014af75430", + "reference": "81d42148474e1852a333ed7a732f2a014af75430", "shasum": "" }, "require": { @@ -2616,20 +2619,20 @@ "type": "tidelift" } ], - "time": "2020-05-31T05:25:51+00:00" + "time": "2020-06-12T11:15:37+00:00" }, { "name": "symfony/mime", - "version": "v5.1.0", + "version": "v5.1.2", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "56261f89385f9d13cf843a5101ac72131190bc91" + "reference": "c0c418f05e727606e85b482a8591519c4712cf45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/56261f89385f9d13cf843a5101ac72131190bc91", - "reference": "56261f89385f9d13cf843a5101ac72131190bc91", + "url": "https://api.github.com/repos/symfony/mime/zipball/c0c418f05e727606e85b482a8591519c4712cf45", + "reference": "c0c418f05e727606e85b482a8591519c4712cf45", "shasum": "" }, "require": { @@ -2693,20 +2696,20 @@ "type": "tidelift" } ], - "time": "2020-05-25T12:33:44+00:00" + "time": "2020-06-09T15:07:35+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9" + "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9", - "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", + "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", "shasum": "" }, "require": { @@ -2719,6 +2722,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -2765,20 +2772,20 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:14:59+00:00" + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424" + "reference": "ba6c9c18db36235b859cc29b8372d1c01298c035" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c4de7601eefbf25f9d47190abe07f79fe0a27424", - "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/ba6c9c18db36235b859cc29b8372d1c01298c035", + "reference": "ba6c9c18db36235b859cc29b8372d1c01298c035", "shasum": "" }, "require": { @@ -2791,6 +2798,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -2838,7 +2849,7 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:47:27+00:00" + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-intl-idn", @@ -2918,16 +2929,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "fa79b11539418b02fc5e1897267673ba2c19419c" + "reference": "7110338d81ce1cbc3e273136e4574663627037a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c", - "reference": "fa79b11539418b02fc5e1897267673ba2c19419c", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7110338d81ce1cbc3e273136e4574663627037a7", + "reference": "7110338d81ce1cbc3e273136e4574663627037a7", "shasum": "" }, "require": { @@ -2940,6 +2951,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -2987,7 +3002,7 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:47:27+00:00" + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-php72", @@ -3060,16 +3075,16 @@ }, { "name": "symfony/polyfill-php73", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc" + "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc", - "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fa0837fe02d617d31fbb25f990655861bb27bd1a", + "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a", "shasum": "" }, "require": { @@ -3079,6 +3094,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -3128,20 +3147,20 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:47:27+00:00" + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.17.0", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd" + "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/5e30b2799bc1ad68f7feb62b60a73743589438dd", - "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4a5b6bba3259902e386eb80dd1956181ee90b5b2", + "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2", "shasum": "" }, "require": { @@ -3151,6 +3170,10 @@ "extra": { "branch-alias": { "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -3204,11 +3227,11 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:47:27+00:00" + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/process", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -3271,20 +3294,20 @@ }, { "name": "symfony/psr-http-message-bridge", - "version": "v2.0.0", + "version": "v2.0.1", "source": { "type": "git", "url": "https://github.com/symfony/psr-http-message-bridge.git", - "reference": "ce709cd9c90872c08c2427b45739d5f3c781ab4f" + "reference": "e44f249afab496b4e8c0f7461fb8140eaa4b24d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/ce709cd9c90872c08c2427b45739d5f3c781ab4f", - "reference": "ce709cd9c90872c08c2427b45739d5f3c781ab4f", + "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/e44f249afab496b4e8c0f7461fb8140eaa4b24d2", + "reference": "e44f249afab496b4e8c0f7461fb8140eaa4b24d2", "shasum": "" }, "require": { - "php": "^7.1", + "php": ">=7.1", "psr/http-message": "^1.0", "symfony/http-foundation": "^4.4 || ^5.0" }, @@ -3331,11 +3354,25 @@ "psr-17", "psr-7" ], - "time": "2020-01-02T08:07:11+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-06-25T08:21:47+00:00" }, { "name": "symfony/routing", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", @@ -3425,16 +3462,16 @@ }, { "name": "symfony/serializer", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "f2d82706d488b87e67050b03a9ae54194b129024" + "reference": "a91ceee34fc690a824770085192ffdeaa4476a8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/f2d82706d488b87e67050b03a9ae54194b129024", - "reference": "f2d82706d488b87e67050b03a9ae54194b129024", + "url": "https://api.github.com/repos/symfony/serializer/zipball/a91ceee34fc690a824770085192ffdeaa4476a8c", + "reference": "a91ceee34fc690a824770085192ffdeaa4476a8c", "shasum": "" }, "require": { @@ -3517,7 +3554,7 @@ "type": "tidelift" } ], - "time": "2020-05-30T20:06:45+00:00" + "time": "2020-06-01T17:29:37+00:00" }, { "name": "symfony/service-contracts", @@ -3593,7 +3630,7 @@ }, { "name": "symfony/translation", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", @@ -3754,7 +3791,7 @@ }, { "name": "symfony/validator", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", @@ -3861,7 +3898,7 @@ }, { "name": "symfony/var-dumper", - "version": "v5.1.0", + "version": "v5.1.2", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", @@ -3951,7 +3988,7 @@ }, { "name": "symfony/yaml", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", @@ -6513,7 +6550,7 @@ }, { "name": "symfony/browser-kit", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", @@ -6586,7 +6623,7 @@ }, { "name": "symfony/css-selector", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -6653,7 +6690,7 @@ }, { "name": "symfony/dom-crawler", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", @@ -6728,7 +6765,7 @@ }, { "name": "symfony/filesystem", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -6792,7 +6829,7 @@ }, { "name": "symfony/finder", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -6855,16 +6892,16 @@ }, { "name": "symfony/lock", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", - "reference": "55b1ae7bcb7f1b126c5d2b492d6f52342bec1951" + "reference": "b2c6895cf282cfc11fae859e8b418c95dbb5d6f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/lock/zipball/55b1ae7bcb7f1b126c5d2b492d6f52342bec1951", - "reference": "55b1ae7bcb7f1b126c5d2b492d6f52342bec1951", + "url": "https://api.github.com/repos/symfony/lock/zipball/b2c6895cf282cfc11fae859e8b418c95dbb5d6f8", + "reference": "b2c6895cf282cfc11fae859e8b418c95dbb5d6f8", "shasum": "" }, "require": { @@ -6930,20 +6967,20 @@ "type": "tidelift" } ], - "time": "2020-05-28T08:27:51+00:00" + "time": "2020-06-09T14:02:17+00:00" }, { "name": "symfony/phpunit-bridge", - "version": "v4.4.9", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "004bf7b78114a8891c9264e4aabe7b281e4131f7" + "reference": "84cb4467ca3ea127f636806e2f6f27c5c1de4eb9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/004bf7b78114a8891c9264e4aabe7b281e4131f7", - "reference": "004bf7b78114a8891c9264e4aabe7b281e4131f7", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/84cb4467ca3ea127f636806e2f6f27c5c1de4eb9", + "reference": "84cb4467ca3ea127f636806e2f6f27c5c1de4eb9", "shasum": "" }, "require": { @@ -7009,7 +7046,7 @@ "type": "tidelift" } ], - "time": "2020-05-21T18:35:07+00:00" + "time": "2020-06-07T15:34:22+00:00" }, { "name": "theseer/tokenizer", diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json index 8006c950ed..a6ebd50bac 100644 --- a/composer/Metapackage/CoreRecommended/composer.json +++ b/composer/Metapackage/CoreRecommended/composer.json @@ -34,32 +34,32 @@ "ralouphie/getallheaders": "3.0.3", "stack/builder": "v1.0.6", "symfony-cmf/routing": "2.3.2", - "symfony/console": "v4.4.9", - "symfony/debug": "v4.4.9", - "symfony/dependency-injection": "v4.4.9", - "symfony/error-handler": "v4.4.9", - "symfony/event-dispatcher": "v4.4.9", + "symfony/console": "v4.4.10", + "symfony/debug": "v4.4.10", + "symfony/dependency-injection": "v4.4.10", + "symfony/error-handler": "v4.4.10", + "symfony/event-dispatcher": "v4.4.10", "symfony/event-dispatcher-contracts": "v1.1.7", - "symfony/http-foundation": "v4.4.9", - "symfony/http-kernel": "v4.4.9", - "symfony/mime": "v5.1.0", - "symfony/polyfill-ctype": "v1.17.0", - "symfony/polyfill-iconv": "v1.17.0", + "symfony/http-foundation": "v4.4.10", + "symfony/http-kernel": "v4.4.10", + "symfony/mime": "v5.1.2", + "symfony/polyfill-ctype": "v1.17.1", + "symfony/polyfill-iconv": "v1.17.1", "symfony/polyfill-intl-idn": "v1.17.0", - "symfony/polyfill-mbstring": "v1.17.0", + "symfony/polyfill-mbstring": "v1.17.1", "symfony/polyfill-php72": "v1.17.0", - "symfony/polyfill-php73": "v1.17.0", - "symfony/polyfill-php80": "v1.17.0", - "symfony/process": "v4.4.9", - "symfony/psr-http-message-bridge": "v2.0.0", - "symfony/routing": "v4.4.9", - "symfony/serializer": "v4.4.9", + "symfony/polyfill-php73": "v1.17.1", + "symfony/polyfill-php80": "v1.17.1", + "symfony/process": "v4.4.10", + "symfony/psr-http-message-bridge": "v2.0.1", + "symfony/routing": "v4.4.10", + "symfony/serializer": "v4.4.10", "symfony/service-contracts": "v2.1.2", - "symfony/translation": "v4.4.9", + "symfony/translation": "v4.4.10", "symfony/translation-contracts": "v2.1.2", - "symfony/validator": "v4.4.9", - "symfony/var-dumper": "v5.1.0", - "symfony/yaml": "v4.4.9", + "symfony/validator": "v4.4.10", + "symfony/var-dumper": "v5.1.2", + "symfony/yaml": "v4.4.10", "twig/twig": "v2.12.5", "typo3/phar-stream-wrapper": "v3.1.4" } diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json index 9851eae6f3..64889b7014 100644 --- a/composer/Metapackage/PinnedDevDependencies/composer.json +++ b/composer/Metapackage/PinnedDevDependencies/composer.json @@ -51,13 +51,13 @@ "seld/jsonlint": "1.8.0", "seld/phar-utils": "1.1.0", "squizlabs/php_codesniffer": "3.5.5", - "symfony/browser-kit": "v4.4.9", - "symfony/css-selector": "v4.4.9", - "symfony/dom-crawler": "v4.4.9", - "symfony/filesystem": "v4.4.9", - "symfony/finder": "v4.4.9", - "symfony/lock": "v4.4.9", - "symfony/phpunit-bridge": "v4.4.9", + "symfony/browser-kit": "v4.4.10", + "symfony/css-selector": "v4.4.10", + "symfony/dom-crawler": "v4.4.10", + "symfony/filesystem": "v4.4.10", + "symfony/finder": "v4.4.10", + "symfony/lock": "v4.4.10", + "symfony/phpunit-bridge": "v4.4.10", "theseer/tokenizer": "1.1.3", "webmozart/assert": "1.8.0" } diff --git a/core/composer.json b/core/composer.json index cf64c7800f..09f59cf915 100644 --- a/core/composer.json +++ b/core/composer.json @@ -196,7 +196,8 @@ "lib/Drupal/Core/DrupalKernelInterface.php", "lib/Drupal/Core/Installer/InstallerRedirectTrait.php", "lib/Drupal/Core/Site/Settings.php" - ] + ], + "files": [ "includes/class_aliases.php" ] }, "config": { "preferred-install": "dist" diff --git a/core/includes/class_aliases.php b/core/includes/class_aliases.php new file mode 100644 index 0000000000..46d064f1ca --- /dev/null +++ b/core/includes/class_aliases.php @@ -0,0 +1,14 @@ += 80000) { + // Class aliases necessary for PHP8. + // @todo remove. + class_alias('\Drupal\Core\Php8\Doctrine\Reflection\StaticReflectionClass', '\Doctrine\Common\Reflection\StaticReflectionClass'); +} diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index 335ea991f6..f952c3e1de 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -1046,9 +1046,6 @@ public static function bootEnvironment($app_root = NULL) { set_error_handler('_drupal_error_handler'); set_exception_handler('_drupal_exception_handler'); - // Class aliases necessary for PHP8. - // @todo remove. - class_alias('\Drupal\Core\Php8\Doctrine\Reflection\StaticReflectionClass', '\Doctrine\Common\Reflection\StaticReflectionClass'); static::$isEnvironmentInitialized = TRUE; }