diff --git a/composer.json b/composer.json index 63b08d9a2d..7e97d356a4 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,8 @@ "composer/installers": "^1.9", "drupal/core": "self.version", "drupal/core-project-message": "self.version", - "drupal/core-vendor-hardening": "self.version" + "drupal/core-vendor-hardening": "self.version", + "symfony/mime": "^5.1" }, "require-dev": { "behat/mink": "^1.8", diff --git a/composer.lock b/composer.lock index e75dc06985..7d72b3bdee 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8877ebb73b0fca58e145989738ba04b4", + "content-hash": "f588f7c6c1717fbe6323fc79f5a0c42d", "packages": [ { "name": "asm89/stack-cors", @@ -183,16 +183,6 @@ "zend", "zikula" ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], "time": "2020-04-07T06:57:05+00:00" }, { @@ -386,20 +376,6 @@ "parser", "php" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", - "type": "tidelift" - } - ], "time": "2020-05-25T17:44:05+00:00" }, { @@ -486,7 +462,7 @@ "dist": { "type": "path", "url": "core", - "reference": "5bd6798a64831fa08a343a14a0ee47127c4cb99f" + "reference": "cd9f9fadbfe411dbbd826fbbbe154931bb664675" }, "require": { "asm89/stack-cors": "^1.1", @@ -516,19 +492,19 @@ "psr/log": "^1.0", "stack/builder": "^1.0", "symfony-cmf/routing": "^2.1", - "symfony/console": "^4.4", - "symfony/dependency-injection": "^4.4", - "symfony/event-dispatcher": "^4.4", - "symfony/http-foundation": "^4.4.7", - "symfony/http-kernel": "^4.4", + "symfony/console": "^5", + "symfony/dependency-injection": "^5", + "symfony/event-dispatcher": "^5", + "symfony/http-foundation": "^5", + "symfony/http-kernel": "^5", "symfony/polyfill-iconv": "^1.0", - "symfony/process": "^4.4", + "symfony/process": "^5", "symfony/psr-http-message-bridge": "^2.0", - "symfony/routing": "^4.4", - "symfony/serializer": "^4.4", - "symfony/translation": "^4.4", - "symfony/validator": "^4.4", - "symfony/yaml": "^4.4", + "symfony/routing": "^5", + "symfony/serializer": "^5", + "symfony/translation": "^5", + "symfony/validator": "^5", + "symfony/yaml": "^5", "twig/twig": "^2.12.0", "typo3/phar-stream-wrapper": "^3.1.3" }, @@ -1698,6 +1674,52 @@ ], "time": "2017-02-14T16:28:37+00:00" }, + { + "name": "psr/event-dispatcher", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\EventDispatcher\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Standard interfaces for event handling.", + "keywords": [ + "events", + "psr", + "psr-14" + ], + "time": "2019-01-08T18:20:26+00:00" + }, { "name": "psr/http-factory", "version": "1.0.1", @@ -1998,42 +2020,44 @@ }, { "name": "symfony/console", - "version": "v4.4.12", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "1f601a29fd7591a0316bffbc0d7550a5953c6c1c" + "reference": "186f395b256065ba9b890c0a4e48a91d598fa2cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/1f601a29fd7591a0316bffbc0d7550a5953c6c1c", - "reference": "1f601a29fd7591a0316bffbc0d7550a5953c6c1c", + "url": "https://api.github.com/repos/symfony/console/zipball/186f395b256065ba9b890c0a4e48a91d598fa2cf", + "reference": "186f395b256065ba9b890c0a4e48a91d598fa2cf", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php73": "^1.8", "symfony/polyfill-php80": "^1.15", - "symfony/service-contracts": "^1.1|^2" + "symfony/service-contracts": "^1.1|^2", + "symfony/string": "^5.1" }, "conflict": { - "symfony/dependency-injection": "<3.4", - "symfony/event-dispatcher": "<4.3|>=5", + "symfony/dependency-injection": "<4.4", + "symfony/dotenv": "<5.1", + "symfony/event-dispatcher": "<4.4", "symfony/lock": "<4.4", - "symfony/process": "<3.3" + "symfony/process": "<4.4" }, "provide": { "psr/log-implementation": "1.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/event-dispatcher": "^4.3", + "symfony/config": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/event-dispatcher": "^4.4|^5.0", "symfony/lock": "^4.4|^5.0", - "symfony/process": "^3.4|^4.0|^5.0", - "symfony/var-dumper": "^4.3|^5.0" + "symfony/process": "^4.4|^5.0", + "symfony/var-dumper": "^4.4|^5.0" }, "suggest": { "psr/log": "For using the console logger", @@ -2044,7 +2068,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -2085,11 +2109,11 @@ "type": "tidelift" } ], - "time": "2020-08-17T07:39:58+00:00" + "time": "2020-09-02T07:07:40+00:00" }, { "name": "symfony/debug", - "version": "v4.4.12", + "version": "v4.4.13", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", @@ -2160,37 +2184,39 @@ }, { "name": "symfony/dependency-injection", - "version": "v4.4.12", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "54bbe10ed0aae7eb38484eb4656442c02509e0e0" + "reference": "48d6890e12ce9cd8e68aaa4fb72010139312fd73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/54bbe10ed0aae7eb38484eb4656442c02509e0e0", - "reference": "54bbe10ed0aae7eb38484eb4656442c02509e0e0", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/48d6890e12ce9cd8e68aaa4fb72010139312fd73", + "reference": "48d6890e12ce9cd8e68aaa4fb72010139312fd73", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", "psr/container": "^1.0", + "symfony/deprecation-contracts": "^2.1", + "symfony/polyfill-php80": "^1.15", "symfony/service-contracts": "^1.1.6|^2" }, "conflict": { - "symfony/config": "<4.3|>=5.0", - "symfony/finder": "<3.4", - "symfony/proxy-manager-bridge": "<3.4", - "symfony/yaml": "<3.4" + "symfony/config": "<5.1", + "symfony/finder": "<4.4", + "symfony/proxy-manager-bridge": "<4.4", + "symfony/yaml": "<4.4" }, "provide": { "psr/container-implementation": "1.0", "symfony/service-implementation": "1.0" }, "require-dev": { - "symfony/config": "^4.3", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/yaml": "^3.4|^4.0|^5.0" + "symfony/config": "^5.1", + "symfony/expression-language": "^4.4|^5.0", + "symfony/yaml": "^4.4|^5.0" }, "suggest": { "symfony/config": "", @@ -2202,7 +2228,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -2243,11 +2269,75 @@ "type": "tidelift" } ], - "time": "2020-08-17T09:56:45+00:00" + "time": "2020-09-01T18:07:16+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "v2.2.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665", + "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "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": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "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-09-07T11:33:47+00:00" }, { "name": "symfony/error-handler", - "version": "v4.4.12", + "version": "v4.4.13", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", @@ -2318,37 +2408,39 @@ }, { "name": "symfony/event-dispatcher", - "version": "v4.4.12", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "3e8ea5ccddd00556b86d69d42f99f1061a704030" + "reference": "94871fc0a69c3c5da57764187724cdce0755899c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3e8ea5ccddd00556b86d69d42f99f1061a704030", - "reference": "3e8ea5ccddd00556b86d69d42f99f1061a704030", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/94871fc0a69c3c5da57764187724cdce0755899c", + "reference": "94871fc0a69c3c5da57764187724cdce0755899c", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/event-dispatcher-contracts": "^1.1" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", + "symfony/event-dispatcher-contracts": "^2", + "symfony/polyfill-php80": "^1.15" }, "conflict": { - "symfony/dependency-injection": "<3.4" + "symfony/dependency-injection": "<4.4" }, "provide": { "psr/event-dispatcher-implementation": "1.0", - "symfony/event-dispatcher-implementation": "1.1" + "symfony/event-dispatcher-implementation": "2.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/http-foundation": "^3.4|^4.0|^5.0", + "symfony/config": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/expression-language": "^4.4|^5.0", + "symfony/http-foundation": "^4.4|^5.0", "symfony/service-contracts": "^1.1|^2", - "symfony/stopwatch": "^3.4|^4.0|^5.0" + "symfony/stopwatch": "^4.4|^5.0" }, "suggest": { "symfony/dependency-injection": "", @@ -2357,7 +2449,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -2398,33 +2490,33 @@ "type": "tidelift" } ], - "time": "2020-08-13T14:18:44+00:00" + "time": "2020-08-13T14:19:42+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.9", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7" + "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7", - "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ba7d54483095a198fa51781bc608d17e84dffa2", + "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.2.5", + "psr/event-dispatcher": "^1" }, "suggest": { - "psr/event-dispatcher": "", "symfony/event-dispatcher-implementation": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "2.2-dev" }, "thanks": { "name": "symfony/contracts", @@ -2474,35 +2566,41 @@ "type": "tidelift" } ], - "time": "2020-07-06T13:19:58+00:00" + "time": "2020-09-07T11:33:47+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.4.12", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "e3e5a62a6631a461954d471e7206e3750dbe8ee1" + "reference": "41a4647f12870e9d41d9a7d72ff0614a27208558" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e3e5a62a6631a461954d471e7206e3750dbe8ee1", - "reference": "e3e5a62a6631a461954d471e7206e3750dbe8ee1", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/41a4647f12870e9d41d9a7d72ff0614a27208558", + "reference": "41a4647f12870e9d41d9a7d72ff0614a27208558", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/mime": "^4.3|^5.0", - "symfony/polyfill-mbstring": "~1.1" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", + "symfony/polyfill-mbstring": "~1.1", + "symfony/polyfill-php80": "^1.15" }, "require-dev": { "predis/predis": "~1.0", - "symfony/expression-language": "^3.4|^4.0|^5.0" + "symfony/cache": "^4.4|^5.0", + "symfony/expression-language": "^4.4|^5.0", + "symfony/mime": "^4.4|^5.0" + }, + "suggest": { + "symfony/mime": "To use the file extension guesser" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -2543,60 +2641,68 @@ "type": "tidelift" } ], - "time": "2020-08-17T07:39:58+00:00" + "time": "2020-08-17T07:48:54+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.13", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "2bb7b90ecdc79813c0bf237b7ff20e79062b5188" + "reference": "3e32676e6cb5d2081c91a56783471ff8a7f7110b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2bb7b90ecdc79813c0bf237b7ff20e79062b5188", - "reference": "2bb7b90ecdc79813c0bf237b7ff20e79062b5188", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3e32676e6cb5d2081c91a56783471ff8a7f7110b", + "reference": "3e32676e6cb5d2081c91a56783471ff8a7f7110b", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", "psr/log": "~1.0", - "symfony/error-handler": "^4.4", - "symfony/event-dispatcher": "^4.4", + "symfony/deprecation-contracts": "^2.1", + "symfony/error-handler": "^4.4|^5.0", + "symfony/event-dispatcher": "^5.0", "symfony/http-foundation": "^4.4|^5.0", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-php73": "^1.9", "symfony/polyfill-php80": "^1.15" }, "conflict": { - "symfony/browser-kit": "<4.3", - "symfony/config": "<3.4", - "symfony/console": ">=5", - "symfony/dependency-injection": "<4.3", - "symfony/translation": "<4.2", - "twig/twig": "<1.34|<2.4,>=2" + "symfony/browser-kit": "<4.4", + "symfony/cache": "<5.0", + "symfony/config": "<5.0", + "symfony/console": "<4.4", + "symfony/dependency-injection": "<4.4", + "symfony/doctrine-bridge": "<5.0", + "symfony/form": "<5.0", + "symfony/http-client": "<5.0", + "symfony/mailer": "<5.0", + "symfony/messenger": "<5.0", + "symfony/translation": "<5.0", + "symfony/twig-bridge": "<5.0", + "symfony/validator": "<5.0", + "twig/twig": "<2.4" }, "provide": { "psr/log-implementation": "1.0" }, "require-dev": { "psr/cache": "~1.0", - "symfony/browser-kit": "^4.3|^5.0", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/console": "^3.4|^4.0", - "symfony/css-selector": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^4.3|^5.0", - "symfony/dom-crawler": "^3.4|^4.0|^5.0", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/finder": "^3.4|^4.0|^5.0", - "symfony/process": "^3.4|^4.0|^5.0", - "symfony/routing": "^3.4|^4.0|^5.0", - "symfony/stopwatch": "^3.4|^4.0|^5.0", - "symfony/templating": "^3.4|^4.0|^5.0", - "symfony/translation": "^4.2|^5.0", + "symfony/browser-kit": "^4.4|^5.0", + "symfony/config": "^5.0", + "symfony/console": "^4.4|^5.0", + "symfony/css-selector": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/dom-crawler": "^4.4|^5.0", + "symfony/expression-language": "^4.4|^5.0", + "symfony/finder": "^4.4|^5.0", + "symfony/process": "^4.4|^5.0", + "symfony/routing": "^4.4|^5.0", + "symfony/stopwatch": "^4.4|^5.0", + "symfony/translation": "^4.4|^5.0", "symfony/translation-contracts": "^1.1|^2", - "twig/twig": "^1.34|^2.4|^3.0" + "twig/twig": "^2.4|^3.0" }, "suggest": { "symfony/browser-kit": "", @@ -2607,7 +2713,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -2648,11 +2754,11 @@ "type": "tidelift" } ], - "time": "2020-09-02T08:09:29+00:00" + "time": "2020-09-02T08:15:18+00:00" }, { "name": "symfony/mime", - "version": "v5.1.4", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", @@ -2880,6 +2986,84 @@ ], "time": "2020-07-14T12:35:20+00:00" }, + { + "name": "symfony/polyfill-intl-grapheme", + "version": "v1.18.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "b740103edbdcc39602239ee8860f0f45a8eb9aa5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b740103edbdcc39602239ee8860f0f45a8eb9aa5", + "reference": "b740103edbdcc39602239ee8860f0f45a8eb9aa5", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "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 polyfill for intl's grapheme_* functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "grapheme", + "intl", + "polyfill", + "portable", + "shim" + ], + "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-07-14T12:35:20+00:00" + }, { "name": "symfony/polyfill-intl-idn", "version": "v1.18.1", @@ -3205,25 +3389,26 @@ }, { "name": "symfony/process", - "version": "v4.4.12", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "65e70bab62f3da7089a8d4591fb23fbacacb3479" + "reference": "1864216226af21eb76d9477f691e7cbf198e0402" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/65e70bab62f3da7089a8d4591fb23fbacacb3479", - "reference": "65e70bab62f3da7089a8d4591fb23fbacacb3479", + "url": "https://api.github.com/repos/symfony/process/zipball/1864216226af21eb76d9477f691e7cbf198e0402", + "reference": "1864216226af21eb76d9477f691e7cbf198e0402", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.2.5", + "symfony/polyfill-php80": "^1.15" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -3264,7 +3449,7 @@ "type": "tidelift" } ], - "time": "2020-07-23T08:31:43+00:00" + "time": "2020-07-23T08:36:24+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -3346,34 +3531,36 @@ }, { "name": "symfony/routing", - "version": "v4.4.12", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "e3387963565da9bae51d1d3ab8041646cc93bd04" + "reference": "47b0218344cb6af25c93ca8ee1137fafbee5005d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/e3387963565da9bae51d1d3ab8041646cc93bd04", - "reference": "e3387963565da9bae51d1d3ab8041646cc93bd04", + "url": "https://api.github.com/repos/symfony/routing/zipball/47b0218344cb6af25c93ca8ee1137fafbee5005d", + "reference": "47b0218344cb6af25c93ca8ee1137fafbee5005d", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", + "symfony/polyfill-php80": "^1.15" }, "conflict": { - "symfony/config": "<4.2", - "symfony/dependency-injection": "<3.4", - "symfony/yaml": "<3.4" + "symfony/config": "<5.0", + "symfony/dependency-injection": "<4.4", + "symfony/yaml": "<4.4" }, "require-dev": { "doctrine/annotations": "~1.2", "psr/log": "~1.0", - "symfony/config": "^4.2|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/http-foundation": "^3.4|^4.0|^5.0", - "symfony/yaml": "^3.4|^4.0|^5.0" + "symfony/config": "^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/expression-language": "^4.4|^5.0", + "symfony/http-foundation": "^4.4|^5.0", + "symfony/yaml": "^4.4|^5.0" }, "suggest": { "doctrine/annotations": "For using the annotation loader", @@ -3385,7 +3572,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -3432,54 +3619,55 @@ "type": "tidelift" } ], - "time": "2020-08-10T07:27:51+00:00" + "time": "2020-08-10T08:03:57+00:00" }, { "name": "symfony/serializer", - "version": "v4.4.12", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "df942d8180c37fa6300af1a8a3705eaef55181c9" + "reference": "bcda9e50d058db10ef149c987edff06c142d07d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/df942d8180c37fa6300af1a8a3705eaef55181c9", - "reference": "df942d8180c37fa6300af1a8a3705eaef55181c9", + "url": "https://api.github.com/repos/symfony/serializer/zipball/bcda9e50d058db10ef149c987edff06c142d07d1", + "reference": "bcda9e50d058db10ef149c987edff06c142d07d1", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-ctype": "~1.8" + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-php80": "^1.15" }, "conflict": { "phpdocumentor/type-resolver": "<0.2.1", - "symfony/dependency-injection": "<3.4", - "symfony/property-access": "<3.4", - "symfony/property-info": "<3.4", - "symfony/yaml": "<3.4" + "symfony/dependency-injection": "<4.4", + "symfony/property-access": "<4.4", + "symfony/property-info": "<4.4", + "symfony/yaml": "<4.4" }, "require-dev": { "doctrine/annotations": "~1.0", "doctrine/cache": "~1.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/cache": "^4.4|^5.0", + "symfony/config": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", "symfony/error-handler": "^4.4|^5.0", - "symfony/http-foundation": "^3.4|^4.0|^5.0", + "symfony/http-foundation": "^4.4|^5.0", "symfony/mime": "^4.4|^5.0", - "symfony/property-access": "^3.4|^4.0|^5.0", - "symfony/property-info": "^3.4.13|~4.0|^5.0", - "symfony/validator": "^3.4|^4.0|^5.0", - "symfony/yaml": "^3.4|^4.0|^5.0" + "symfony/property-access": "^4.4|^5.0", + "symfony/property-info": "^4.4|^5.0", + "symfony/validator": "^4.4|^5.0", + "symfony/yaml": "^4.4|^5.0" }, "suggest": { "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", "doctrine/cache": "For using the default cached annotation reader and metadata cache.", "psr/cache-implementation": "For using the metadata cache.", "symfony/config": "For using the XML mapping loader.", - "symfony/http-foundation": "For using a MIME type guesser within the DataUriNormalizer.", + "symfony/mime": "For using a MIME type guesser within the DataUriNormalizer.", "symfony/property-access": "For using the ObjectNormalizer.", "symfony/property-info": "To deserialize relations.", "symfony/yaml": "For using the default YAML mapping loader." @@ -3487,7 +3675,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -3528,20 +3716,20 @@ "type": "tidelift" } ], - "time": "2020-08-30T07:21:38+00:00" + "time": "2020-09-01T05:52:18+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.1.3", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442" + "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/58c7475e5457c5492c26cc740cc0ad7464be9442", - "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1", + "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1", "shasum": "" }, "require": { @@ -3554,7 +3742,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" }, "thanks": { "name": "symfony/contracts", @@ -3604,46 +3792,133 @@ "type": "tidelift" } ], - "time": "2020-07-06T13:23:11+00:00" + "time": "2020-09-07T11:33:47+00:00" + }, + { + "name": "symfony/string", + "version": "v5.1.5", + "source": { + "type": "git", + "url": "https://github.com/symfony/string.git", + "reference": "0de4cc1e18bb596226c06a82e2e7e9bc6001a63a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/string/zipball/0de4cc1e18bb596226c06a82e2e7e9bc6001a63a", + "reference": "0de4cc1e18bb596226c06a82e2e7e9bc6001a63a", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "~1.15" + }, + "require-dev": { + "symfony/error-handler": "^4.4|^5.0", + "symfony/http-client": "^4.4|^5.0", + "symfony/translation-contracts": "^1.1|^2", + "symfony/var-exporter": "^4.4|^5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\String\\": "" + }, + "files": [ + "Resources/functions.php" + ], + "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 String component", + "homepage": "https://symfony.com", + "keywords": [ + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" + ], + "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-08-17T07:48:54+00:00" }, { "name": "symfony/translation", - "version": "v4.4.12", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "700e6e50174b0cdcf0fa232773bec5c314680575" + "reference": "917b02cdc5f33e0309b8e9d33ee1480b20687413" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/700e6e50174b0cdcf0fa232773bec5c314680575", - "reference": "700e6e50174b0cdcf0fa232773bec5c314680575", + "url": "https://api.github.com/repos/symfony/translation/zipball/917b02cdc5f33e0309b8e9d33ee1480b20687413", + "reference": "917b02cdc5f33e0309b8e9d33ee1480b20687413", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", "symfony/polyfill-mbstring": "~1.0", - "symfony/translation-contracts": "^1.1.6|^2" + "symfony/polyfill-php80": "^1.15", + "symfony/translation-contracts": "^2" }, "conflict": { - "symfony/config": "<3.4", - "symfony/dependency-injection": "<3.4", - "symfony/http-kernel": "<4.4", - "symfony/yaml": "<3.4" + "symfony/config": "<4.4", + "symfony/dependency-injection": "<5.0", + "symfony/http-kernel": "<5.0", + "symfony/twig-bundle": "<5.0", + "symfony/yaml": "<4.4" }, "provide": { - "symfony/translation-implementation": "1.0" + "symfony/translation-implementation": "2.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "^3.4|^4.0|^5.0", - "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": "^4.4", - "symfony/intl": "^3.4|^4.0|^5.0", + "symfony/config": "^4.4|^5.0", + "symfony/console": "^4.4|^5.0", + "symfony/dependency-injection": "^5.0", + "symfony/finder": "^4.4|^5.0", + "symfony/http-kernel": "^5.0", + "symfony/intl": "^4.4|^5.0", "symfony/service-contracts": "^1.1.2|^2", - "symfony/yaml": "^3.4|^4.0|^5.0" + "symfony/yaml": "^4.4|^5.0" }, "suggest": { "psr/log-implementation": "To use logging capability in translator", @@ -3653,7 +3928,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -3694,20 +3969,20 @@ "type": "tidelift" } ], - "time": "2020-08-17T09:56:45+00:00" + "time": "2020-08-17T10:01:29+00:00" }, { "name": "symfony/translation-contracts", - "version": "v2.1.3", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "616a9773c853097607cf9dd6577d5b143ffdcd63" + "reference": "77ce1c3627c9f39643acd9af086631f842c50c4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/616a9773c853097607cf9dd6577d5b143ffdcd63", - "reference": "616a9773c853097607cf9dd6577d5b143ffdcd63", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/77ce1c3627c9f39643acd9af086631f842c50c4d", + "reference": "77ce1c3627c9f39643acd9af086631f842c50c4d", "shasum": "" }, "require": { @@ -3719,7 +3994,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" }, "thanks": { "name": "symfony/contracts", @@ -3769,54 +4044,58 @@ "type": "tidelift" } ], - "time": "2020-07-06T13:23:11+00:00" + "time": "2020-09-07T11:33:47+00:00" }, { "name": "symfony/validator", - "version": "v4.4.12", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "cee2f13ddc3fc0cfa2f5b115eaae860cef9c056f" + "reference": "db6acf2a0ea02fdb89b561c7bba3db2c0eaecd9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/cee2f13ddc3fc0cfa2f5b115eaae860cef9c056f", - "reference": "cee2f13ddc3fc0cfa2f5b115eaae860cef9c056f", + "url": "https://api.github.com/repos/symfony/validator/zipball/db6acf2a0ea02fdb89b561c7bba3db2c0eaecd9a", + "reference": "db6acf2a0ea02fdb89b561c7bba3db2c0eaecd9a", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.0", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "^1.15", "symfony/translation-contracts": "^1.1|^2" }, "conflict": { "doctrine/lexer": "<1.0.2", - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", - "symfony/dependency-injection": "<3.4", + "phpunit/phpunit": "<5.4.3", + "symfony/dependency-injection": "<4.4", + "symfony/expression-language": "<5.1", "symfony/http-kernel": "<4.4", - "symfony/intl": "<4.3", - "symfony/translation": ">=5.0", - "symfony/yaml": "<3.4" + "symfony/intl": "<4.4", + "symfony/translation": "<4.4", + "symfony/yaml": "<4.4" }, "require-dev": { "doctrine/annotations": "~1.7", "doctrine/cache": "~1.0", "egulias/email-validator": "^2.1.10", - "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/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": "^4.4", - "symfony/intl": "^4.3|^5.0", + "symfony/cache": "^4.4|^5.0", + "symfony/config": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/expression-language": "^5.1", + "symfony/http-client": "^4.4|^5.0", + "symfony/http-foundation": "^4.4|^5.0", + "symfony/http-kernel": "^4.4|^5.0", + "symfony/intl": "^4.4|^5.0", "symfony/mime": "^4.4|^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/yaml": "^3.4|^4.0|^5.0" + "symfony/phpunit-bridge": "^5.1", + "symfony/property-access": "^4.4|^5.0", + "symfony/property-info": "^4.4|^5.0", + "symfony/translation": "^4.4|^5.0", + "symfony/yaml": "^4.4|^5.0" }, "suggest": { "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", @@ -3824,7 +4103,7 @@ "egulias/email-validator": "Strict (RFC compliant) email validation", "psr/cache-implementation": "For using the mapping cache.", "symfony/config": "", - "symfony/expression-language": "For using the Expression validator", + "symfony/expression-language": "For using the Expression validator and the ExpressionLanguageSyntax constraints", "symfony/http-foundation": "", "symfony/intl": "", "symfony/property-access": "For accessing properties within comparison constraints", @@ -3835,7 +4114,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -3876,11 +4155,11 @@ "type": "tidelift" } ], - "time": "2020-08-21T09:47:32+00:00" + "time": "2020-08-31T09:01:51+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.1.4", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", @@ -3970,35 +4249,39 @@ }, { "name": "symfony/yaml", - "version": "v4.4.12", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "e2a69525b11a33be51cb00b8d6d13a9258a296b1" + "reference": "a44bd3a91bfbf8db12367fa6ffac9c3eb1a8804a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/e2a69525b11a33be51cb00b8d6d13a9258a296b1", - "reference": "e2a69525b11a33be51cb00b8d6d13a9258a296b1", + "url": "https://api.github.com/repos/symfony/yaml/zipball/a44bd3a91bfbf8db12367fa6ffac9c3eb1a8804a", + "reference": "a44bd3a91bfbf8db12367fa6ffac9c3eb1a8804a", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-ctype": "~1.8" }, "conflict": { - "symfony/console": "<3.4" + "symfony/console": "<4.4" }, "require-dev": { - "symfony/console": "^3.4|^4.0|^5.0" + "symfony/console": "^4.4|^5.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" }, + "bin": [ + "Resources/bin/yaml-lint" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -4039,7 +4322,7 @@ "type": "tidelift" } ], - "time": "2020-08-26T08:30:46+00:00" + "time": "2020-08-26T08:30:57+00:00" }, { "name": "twig/twig", @@ -4749,20 +5032,6 @@ "constructor", "instantiate" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], "time": "2020-05-29T17:27:14+00:00" }, { @@ -6573,7 +6842,7 @@ }, { "name": "symfony/browser-kit", - "version": "v4.4.12", + "version": "v4.4.13", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", @@ -6646,7 +6915,7 @@ }, { "name": "symfony/css-selector", - "version": "v4.4.12", + "version": "v4.4.13", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -6713,7 +6982,7 @@ }, { "name": "symfony/dom-crawler", - "version": "v4.4.12", + "version": "v4.4.13", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", @@ -6788,7 +7057,7 @@ }, { "name": "symfony/filesystem", - "version": "v4.4.12", + "version": "v4.4.13", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -6852,7 +7121,7 @@ }, { "name": "symfony/finder", - "version": "v4.4.12", + "version": "v4.4.13", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -6915,7 +7184,7 @@ }, { "name": "symfony/lock", - "version": "v4.4.12", + "version": "v4.4.13", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", @@ -6994,16 +7263,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v5.1.4", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "3229133c5f966d50a741a668e54b34c1368200a0" + "reference": "e7d37c91486a0f9eed58a8c23822e1870ea36db5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/3229133c5f966d50a741a668e54b34c1368200a0", - "reference": "3229133c5f966d50a741a668e54b34c1368200a0", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e7d37c91486a0f9eed58a8c23822e1870ea36db5", + "reference": "e7d37c91486a0f9eed58a8c23822e1870ea36db5", "shasum": "" }, "require": { @@ -7069,7 +7338,7 @@ "type": "tidelift" } ], - "time": "2020-08-28T16:19:35+00:00" + "time": "2020-09-01T13:16:17+00:00" }, { "name": "theseer/tokenizer", diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json index 39e3d9b6d0..266c245e2a 100644 --- a/composer/Metapackage/CoreRecommended/composer.json +++ b/composer/Metapackage/CoreRecommended/composer.json @@ -28,37 +28,41 @@ "pear/pear-core-minimal": "v1.10.10", "pear/pear_exception": "v1.0.1", "psr/container": "1.0.0", + "psr/event-dispatcher": "1.0.0", "psr/http-factory": "1.0.1", "psr/http-message": "1.0.1", "psr/log": "1.1.3", "ralouphie/getallheaders": "3.0.3", "stack/builder": "v1.0.6", "symfony-cmf/routing": "2.3.2", - "symfony/console": "v4.4.12", - "symfony/debug": "v4.4.12", - "symfony/dependency-injection": "v4.4.12", - "symfony/error-handler": "v4.4.12", - "symfony/event-dispatcher": "v4.4.12", - "symfony/event-dispatcher-contracts": "v1.1.9", - "symfony/http-foundation": "v4.4.12", - "symfony/http-kernel": "v4.4.13", - "symfony/mime": "v5.1.4", + "symfony/console": "v5.1.5", + "symfony/debug": "v4.4.13", + "symfony/dependency-injection": "v5.1.5", + "symfony/deprecation-contracts": "v2.2.0", + "symfony/error-handler": "v4.4.13", + "symfony/event-dispatcher": "v5.1.5", + "symfony/event-dispatcher-contracts": "v2.2.0", + "symfony/http-foundation": "v5.1.5", + "symfony/http-kernel": "v5.1.5", + "symfony/mime": "v5.1.5", "symfony/polyfill-ctype": "v1.18.1", "symfony/polyfill-iconv": "v1.18.1", + "symfony/polyfill-intl-grapheme": "v1.18.1", "symfony/polyfill-intl-idn": "v1.18.1", "symfony/polyfill-intl-normalizer": "v1.18.1", "symfony/polyfill-mbstring": "v1.18.1", "symfony/polyfill-php80": "v1.18.1", - "symfony/process": "v4.4.12", + "symfony/process": "v5.1.5", "symfony/psr-http-message-bridge": "v2.0.1", - "symfony/routing": "v4.4.12", - "symfony/serializer": "v4.4.12", - "symfony/service-contracts": "v2.1.3", - "symfony/translation": "v4.4.12", - "symfony/translation-contracts": "v2.1.3", - "symfony/validator": "v4.4.12", - "symfony/var-dumper": "v5.1.4", - "symfony/yaml": "v4.4.12", + "symfony/routing": "v5.1.5", + "symfony/serializer": "v5.1.5", + "symfony/service-contracts": "v2.2.0", + "symfony/string": "v5.1.5", + "symfony/translation": "v5.1.5", + "symfony/translation-contracts": "v2.2.0", + "symfony/validator": "v5.1.5", + "symfony/var-dumper": "v5.1.5", + "symfony/yaml": "v5.1.5", "twig/twig": "v2.13.1", "typo3/phar-stream-wrapper": "v3.1.5" } diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json index f032858e0a..5dffe27a08 100644 --- a/composer/Metapackage/PinnedDevDependencies/composer.json +++ b/composer/Metapackage/PinnedDevDependencies/composer.json @@ -51,13 +51,13 @@ "seld/jsonlint": "1.8.2", "seld/phar-utils": "1.1.1", "squizlabs/php_codesniffer": "3.5.6", - "symfony/browser-kit": "v4.4.12", - "symfony/css-selector": "v4.4.12", - "symfony/dom-crawler": "v4.4.12", - "symfony/filesystem": "v4.4.12", - "symfony/finder": "v4.4.12", - "symfony/lock": "v4.4.12", - "symfony/phpunit-bridge": "v5.1.4", + "symfony/browser-kit": "v4.4.13", + "symfony/css-selector": "v4.4.13", + "symfony/dom-crawler": "v4.4.13", + "symfony/filesystem": "v4.4.13", + "symfony/finder": "v4.4.13", + "symfony/lock": "v4.4.13", + "symfony/phpunit-bridge": "v5.1.5", "theseer/tokenizer": "1.2.0", "webmozart/assert": "1.9.1" } diff --git a/core/composer.json b/core/composer.json index cf64c7800f..919a368a6b 100644 --- a/core/composer.json +++ b/core/composer.json @@ -18,18 +18,18 @@ "ext-tokenizer": "*", "ext-xml": "*", "php": ">=7.3", - "symfony/console": "^4.4", - "symfony/dependency-injection": "^4.4", - "symfony/event-dispatcher": "^4.4", - "symfony/http-foundation": "^4.4.7", - "symfony/http-kernel": "^4.4", - "symfony/routing": "^4.4", - "symfony/serializer": "^4.4", - "symfony/translation": "^4.4", - "symfony/validator": "^4.4", - "symfony/process": "^4.4", + "symfony/console": "^5", + "symfony/dependency-injection": "^5", + "symfony/event-dispatcher": "^5", + "symfony/http-foundation": "^5", + "symfony/http-kernel": "^5", + "symfony/routing": "^5", + "symfony/serializer": "^5", + "symfony/translation": "^5", + "symfony/validator": "^5", + "symfony/process": "^5", "symfony/polyfill-iconv": "^1.0", - "symfony/yaml": "^4.4", + "symfony/yaml": "^5", "typo3/phar-stream-wrapper": "^3.1.3", "twig/twig": "^2.12.0", "doctrine/reflection": "^1.1", diff --git a/core/core.api.php b/core/core.api.php index 999ee3d973..5c8f8a1d45 100644 --- a/core/core.api.php +++ b/core/core.api.php @@ -2502,7 +2502,7 @@ function hook_validation_constraint_alter(array &$definitions) { * * @section sec_dispatch Dispatching events * To dispatch an event, call the - * \Symfony\Component\EventDispatcher\EventDispatcherInterface::dispatch() + * \Symfony\Contracts\EventDispatcher\EventDispatcherInterface::dispatch() * method on the 'event_dispatcher' service (see the * @link container Services topic @endlink for more information about how to * interact with services). The first argument is the unique event name, which diff --git a/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php index 0cf5669543..7c561e3b19 100644 --- a/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php +++ b/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php @@ -3,11 +3,9 @@ namespace Drupal\Component\EventDispatcher; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\EventDispatcher\Event; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Symfony\Contracts\EventDispatcher\Event as ContractsEvent; -use Symfony\Contracts\EventDispatcher\EventDispatcherInterface as ContractsEventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\Event; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * A performance optimized container aware event dispatcher. @@ -88,40 +86,8 @@ public function __construct(ContainerInterface $container, array $listeners = [] /** * {@inheritdoc} */ - public function dispatch($event/*, string $event_name = NULL*/) { - $event_name = 1 < \func_num_args() ? func_get_arg(1) : NULL; - if (\is_object($event)) { - $class_name = get_class($event); - $event_name = $event_name ?? $class_name; - - $deprecation_message = 'Symfony\Component\EventDispatcher\Event is deprecated in drupal:9.1.0 and will be replaced by Symfony\Contracts\EventDispatcher\Event in drupal:10.0.0. A new Drupal\Component\EventDispatcher\Event class is available to bridge the two versions of the class. See https://www.drupal.org/node/3159012'; - - // Trigger a deprecation error if the deprecated Event class is used - // directly. - if ($class_name === 'Symfony\Component\EventDispatcher\Event') { - @trigger_error($deprecation_message, E_USER_DEPRECATED); - } - // Also try to trigger deprecation errors when classes are in the Drupal - // namespace and inherit directly from the deprecated class. If a class is - // in the Symfony namespace or a different one, we have to assume those - // will be updated by the dependency itself. Exclude the Drupal Event - // bridge class as a special case, otherwise it's pointless. - elseif ($class_name !== 'Drupal\Component\EventDispatcher\Event' && strpos($class_name, 'Drupal') !== FALSE) { - if (get_parent_class($event) === 'Symfony\Component\EventDispatcher\Event') { - @trigger_error($deprecation_message, E_USER_DEPRECATED); - } - } - } - elseif (\is_string($event) && (NULL === $event_name || $event_name instanceof ContractsEvent || $event_name instanceof Event)) { - @trigger_error('Calling the Symfony\Component\EventDispatcher\EventDispatcherInterface::dispatch() method with a string event name as the first argument is deprecated in drupal:9.1.0, an Event object will be required instead in drupal:10.0.0. See https://www.drupal.org/node/3154407', E_USER_DEPRECATED); - $swap = $event; - $event = $event_name ?? new Event(); - $event_name = $swap; - } - else { - throw new \TypeError(sprintf('Argument 1 passed to "%s::dispatch()" must be an object, %s given.', ContractsEventDispatcherInterface::class, \gettype($event))); - } - + public function dispatch(object $event, string $event_name = NULL): object { + $event_name = is_string($event_name) ?? get_class($event); if (isset($this->listeners[$event_name])) { // Sort listeners if necessary. if (isset($this->unsorted[$event_name])) { diff --git a/core/lib/Drupal/Component/EventDispatcher/Event.php b/core/lib/Drupal/Component/EventDispatcher/Event.php index 5d6dfe017e..4586c73588 100644 --- a/core/lib/Drupal/Component/EventDispatcher/Event.php +++ b/core/lib/Drupal/Component/EventDispatcher/Event.php @@ -2,7 +2,7 @@ namespace Drupal\Component\EventDispatcher; -use Symfony\Component\EventDispatcher\Event as SymfonyEvent; +use Symfony\Contracts\EventDispatcher\Event as SymfonyEvent; /** * Provides a forward-compatibility layer for the Symfony 5 event class. diff --git a/core/lib/Drupal/Core/Action/Plugin/Action/GotoAction.php b/core/lib/Drupal/Core/Action/Plugin/Action/GotoAction.php index b19a3d991c..9fb6b0b61e 100644 --- a/core/lib/Drupal/Core/Action/Plugin/Action/GotoAction.php +++ b/core/lib/Drupal/Core/Action/Plugin/Action/GotoAction.php @@ -10,7 +10,7 @@ use Drupal\Core\Session\AccountInterface; use Drupal\Core\Utility\UnroutedUrlAssemblerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpKernel\KernelEvents; @@ -28,7 +28,7 @@ class GotoAction extends ConfigurableActionBase implements ContainerFactoryPlugi /** * The event dispatcher service. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $dispatcher; @@ -48,7 +48,7 @@ class GotoAction extends ConfigurableActionBase implements ContainerFactoryPlugi * The plugin ID for the plugin instance. * @param mixed $plugin_definition * The plugin implementation definition. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $dispatcher * The tempstore factory. * @param \Drupal\Core\Utility\UnroutedUrlAssemblerInterface $url_assembler * The unrouted URL assembler service. diff --git a/core/lib/Drupal/Core/Config/Config.php b/core/lib/Drupal/Core/Config/Config.php index 026bb55e9f..38bb3d5db7 100644 --- a/core/lib/Drupal/Core/Config/Config.php +++ b/core/lib/Drupal/Core/Config/Config.php @@ -4,7 +4,7 @@ use Drupal\Component\Utility\NestedArray; use Drupal\Core\Cache\Cache; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * Defines the default configuration object. @@ -21,7 +21,7 @@ class Config extends StorableConfigBase { /** * An event dispatcher instance to use for configuration events. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -57,7 +57,7 @@ class Config extends StorableConfigBase { * @param \Drupal\Core\Config\StorageInterface $storage * A storage object to use for reading and writing the * configuration data. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * An event dispatcher instance to use for configuration events. * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_config * The typed configuration manager service. diff --git a/core/lib/Drupal/Core/Config/ConfigFactory.php b/core/lib/Drupal/Core/Config/ConfigFactory.php index 53e04d2785..112cd9f311 100644 --- a/core/lib/Drupal/Core/Config/ConfigFactory.php +++ b/core/lib/Drupal/Core/Config/ConfigFactory.php @@ -4,7 +4,7 @@ use Drupal\Component\Utility\NestedArray; use Drupal\Core\Cache\Cache; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** @@ -34,7 +34,7 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface /** * An event dispatcher instance to use for configuration events. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -64,7 +64,7 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface * * @param \Drupal\Core\Config\StorageInterface $storage * The configuration storage engine. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * An event dispatcher instance to use for configuration events. * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_config * The typed configuration manager. diff --git a/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php index 25b7d0afbb..05e2ea2104 100644 --- a/core/lib/Drupal/Core/Config/ConfigImporter.php +++ b/core/lib/Drupal/Core/Config/ConfigImporter.php @@ -13,7 +13,7 @@ use Drupal\Core\Lock\LockBackendInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\Core\StringTranslation\TranslationInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * Defines a configuration importer. @@ -53,7 +53,7 @@ class ConfigImporter { /** * The event dispatcher used to notify subscribers. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -172,7 +172,7 @@ class ConfigImporter { * @param \Drupal\Core\Config\StorageComparerInterface $storage_comparer * A storage comparer object used to determine configuration changes and * access the source and target storage objects. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher used to notify subscribers of config import events. * @param \Drupal\Core\Config\ConfigManagerInterface $config_manager * The configuration manager. diff --git a/core/lib/Drupal/Core/Config/ConfigInstaller.php b/core/lib/Drupal/Core/Config/ConfigInstaller.php index 235a7c1a41..082de18d91 100644 --- a/core/lib/Drupal/Core/Config/ConfigInstaller.php +++ b/core/lib/Drupal/Core/Config/ConfigInstaller.php @@ -5,7 +5,7 @@ use Drupal\Component\Utility\Crypt; use Drupal\Core\Config\Entity\ConfigDependencyManager; use Drupal\Core\Installer\InstallerKernel; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; class ConfigInstaller implements ConfigInstallerInterface { @@ -40,7 +40,7 @@ class ConfigInstaller implements ConfigInstallerInterface { /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -76,7 +76,7 @@ class ConfigInstaller implements ConfigInstallerInterface { * The typed configuration manager. * @param \Drupal\Core\Config\ConfigManagerInterface $config_manager * The configuration manager. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher. * @param string $install_profile * The name of the currently active installation profile. diff --git a/core/lib/Drupal/Core/Config/ConfigManager.php b/core/lib/Drupal/Core/Config/ConfigManager.php index 71549978f3..c6ea46f758 100644 --- a/core/lib/Drupal/Core/Config/ConfigManager.php +++ b/core/lib/Drupal/Core/Config/ConfigManager.php @@ -12,7 +12,7 @@ use Drupal\Core\Serialization\Yaml; use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\Core\StringTranslation\TranslationInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * The ConfigManager provides helper functions for the configuration system. @@ -59,7 +59,7 @@ class ConfigManager implements ConfigManagerInterface { /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -90,7 +90,7 @@ class ConfigManager implements ConfigManagerInterface { * The string translation service. * @param \Drupal\Core\Config\StorageInterface $active_storage * The active configuration storage. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher. * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository * The entity repository. diff --git a/core/lib/Drupal/Core/Config/ExportStorageManager.php b/core/lib/Drupal/Core/Config/ExportStorageManager.php index aeaadedeb5..43591717ab 100644 --- a/core/lib/Drupal/Core/Config/ExportStorageManager.php +++ b/core/lib/Drupal/Core/Config/ExportStorageManager.php @@ -4,7 +4,7 @@ use Drupal\Core\Database\Connection; use Drupal\Core\Lock\LockBackendInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * The export storage manager dispatches an event for the export storage. @@ -39,7 +39,7 @@ final class ExportStorageManager implements StorageManagerInterface { /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -57,7 +57,7 @@ final class ExportStorageManager implements StorageManagerInterface { * The active config storage to prime the export storage. * @param \Drupal\Core\Database\Connection $connection * The database connection. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher. * @param \Drupal\Core\Lock\LockBackendInterface $lock * The used lock backend instance. diff --git a/core/lib/Drupal/Core/Config/ImportStorageTransformer.php b/core/lib/Drupal/Core/Config/ImportStorageTransformer.php index fcd5a12d59..13efb7507c 100644 --- a/core/lib/Drupal/Core/Config/ImportStorageTransformer.php +++ b/core/lib/Drupal/Core/Config/ImportStorageTransformer.php @@ -4,7 +4,7 @@ use Drupal\Core\Database\Connection; use Drupal\Core\Lock\LockBackendInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * The import storage transformer helps to use the configuration management api. @@ -26,7 +26,7 @@ final class ImportStorageTransformer { /** * The event dispatcher to get changes to the configuration. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -56,7 +56,7 @@ final class ImportStorageTransformer { /** * ImportStorageTransformer constructor. * - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher. * @param \Drupal\Core\Database\Connection $connection * The database connection. diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index a19197f4ad..14e0401dd1 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -595,9 +595,6 @@ public function preHandle(Request $request) { // Set the allowed protocols. UrlHelper::setAllowedProtocols($this->container->getParameter('filter_protocols')); - // Override of Symfony's MIME type guesser singleton. - MimeTypeGuesser::registerWithSymfonyGuesser($this->container); - $this->prepared = TRUE; } diff --git a/core/lib/Drupal/Core/Entity/EntityTypeListener.php b/core/lib/Drupal/Core/Entity/EntityTypeListener.php index 32e7f47710..0768dee0c8 100644 --- a/core/lib/Drupal/Core/Entity/EntityTypeListener.php +++ b/core/lib/Drupal/Core/Entity/EntityTypeListener.php @@ -2,7 +2,7 @@ namespace Drupal\Core\Entity; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * Reacts to entity type CRUD on behalf of the Entity system. @@ -28,7 +28,7 @@ class EntityTypeListener implements EntityTypeListenerInterface { /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -46,7 +46,7 @@ class EntityTypeListener implements EntityTypeListenerInterface { * The entity type manager. * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager * The entity field manager. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher. * @param \Drupal\Core\Entity\EntityLastInstalledSchemaRepositoryInterface $entity_last_installed_schema_repository * The entity last installed schema repository. diff --git a/core/lib/Drupal/Core/Field/FieldStorageDefinitionListener.php b/core/lib/Drupal/Core/Field/FieldStorageDefinitionListener.php index 8e52ec6642..06e06488ab 100644 --- a/core/lib/Drupal/Core/Field/FieldStorageDefinitionListener.php +++ b/core/lib/Drupal/Core/Field/FieldStorageDefinitionListener.php @@ -6,7 +6,7 @@ use Drupal\Core\Entity\EntityFieldManagerInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Entity\FieldableEntityStorageInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * Reacts to field storage definition CRUD on behalf of the Entity system. @@ -25,7 +25,7 @@ class FieldStorageDefinitionListener implements FieldStorageDefinitionListenerIn /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -55,7 +55,7 @@ class FieldStorageDefinitionListener implements FieldStorageDefinitionListenerIn * * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager * The entity type manager. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher. * @param \Drupal\Core\Entity\EntityLastInstalledSchemaRepositoryInterface $entity_last_installed_schema_repository * The entity last installed schema repository. diff --git a/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php b/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php index b0798000aa..d7cf0c99b2 100644 --- a/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php +++ b/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php @@ -3,13 +3,12 @@ namespace Drupal\Core\File\MimeType; use Drupal\Core\Extension\ModuleHandlerInterface; -use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface as LegacyMimeTypeGuesserInterface; use Symfony\Component\Mime\MimeTypeGuesserInterface; /** * Makes possible to guess the MIME type of a file using its extension. */ -class ExtensionMimeTypeGuesser implements MimeTypeGuesserInterface, LegacyMimeTypeGuesserInterface { +class ExtensionMimeTypeGuesser implements MimeTypeGuesserInterface { /** * Default MIME extension mapping. * Unmerged path core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php diff --git a/core/lib/Drupal/Core/Form/FormBuilder.php b/core/lib/Drupal/Core/Form/FormBuilder.php index cc680fa9b9..1d92afc45d 100644 --- a/core/lib/Drupal/Core/Form/FormBuilder.php +++ b/core/lib/Drupal/Core/Form/FormBuilder.php @@ -17,7 +17,7 @@ use Drupal\Core\Render\ElementInfoManagerInterface; use Drupal\Core\Security\TrustedCallbackInterface; use Drupal\Core\Theme\ThemeManagerInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\FileBag; use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\RequestStack; @@ -40,7 +40,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -157,7 +157,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS * The form cache. * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * The module handler. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher. * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack * The request stack. diff --git a/core/lib/Drupal/Core/ProxyClass/File/MimeType/ExtensionMimeTypeGuesser.php b/core/lib/Drupal/Core/ProxyClass/File/MimeType/ExtensionMimeTypeGuesser.php index d3f3fef6eb..f771e15b45 100644 --- a/core/lib/Drupal/Core/ProxyClass/File/MimeType/ExtensionMimeTypeGuesser.php +++ b/core/lib/Drupal/Core/ProxyClass/File/MimeType/ExtensionMimeTypeGuesser.php @@ -12,7 +12,7 @@ * * @see \Drupal\Component\ProxyBuilder */ - class ExtensionMimeTypeGuesser implements \Symfony\Component\Mime\MimeTypeGuesserInterface, \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface + class ExtensionMimeTypeGuesser implements \Symfony\Component\Mime\MimeTypeGuesserInterface { use \Drupal\Core\DependencyInjection\DependencySerializationTrait; diff --git a/core/lib/Drupal/Core/ProxyClass/File/MimeType/MimeTypeGuesser.php b/core/lib/Drupal/Core/ProxyClass/File/MimeType/MimeTypeGuesser.php index bbc8b16e32..94f6a7abe5 100644 --- a/core/lib/Drupal/Core/ProxyClass/File/MimeType/MimeTypeGuesser.php +++ b/core/lib/Drupal/Core/ProxyClass/File/MimeType/MimeTypeGuesser.php @@ -12,7 +12,7 @@ * * @see \Drupal\Component\ProxyBuilder */ - class MimeTypeGuesser implements \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface, \Symfony\Component\Mime\MimeTypeGuesserInterface + class MimeTypeGuesser implements \Symfony\Component\Mime\MimeTypeGuesserInterface { use \Drupal\Core\DependencyInjection\DependencySerializationTrait; @@ -86,19 +86,11 @@ public function guess($path) /** * {@inheritdoc} */ - public function addMimeTypeGuesser($guesser, $priority = 0) + public function addMimeTypeGuesser(\Symfony\Component\Mime\MimeTypeGuesserInterface $guesser, $priority = 0) { return $this->lazyLoadItself()->addMimeTypeGuesser($guesser, $priority); } - /** - * {@inheritdoc} - */ - public function addGuesser(\Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface $guesser, $priority = 0) - { - return $this->lazyLoadItself()->addGuesser($guesser, $priority); - } - /** * {@inheritdoc} */ diff --git a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php index 66af0a82d4..46992d8f68 100644 --- a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php +++ b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php @@ -16,7 +16,7 @@ use Drupal\Core\Render\RenderEvents; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Theme\ThemeManagerInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\Request; /** @@ -48,7 +48,7 @@ class HtmlRenderer implements MainContentRendererInterface { /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; /** @@ -95,7 +95,7 @@ class HtmlRenderer implements MainContentRendererInterface { * The title resolver. * @param \Drupal\Component\Plugin\PluginManagerInterface $display_variant_manager * The display variant manager. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher. * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * The module handler. diff --git a/core/lib/Drupal/Core/Routing/RouteBuilder.php b/core/lib/Drupal/Core/Routing/RouteBuilder.php index b0f785fd9f..43dd1569b0 100644 --- a/core/lib/Drupal/Core/Routing/RouteBuilder.php +++ b/core/lib/Drupal/Core/Routing/RouteBuilder.php @@ -9,7 +9,7 @@ use Drupal\Core\Lock\LockBackendInterface; use Drupal\Core\DestructableInterface; use Drupal\Component\EventDispatcher\Event; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Routing\RouteCollection; use Symfony\Component\Routing\Route; @@ -35,7 +35,7 @@ class RouteBuilder implements RouteBuilderInterface, DestructableInterface { /** * The event dispatcher to notify of routes. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $dispatcher; @@ -88,7 +88,7 @@ class RouteBuilder implements RouteBuilderInterface, DestructableInterface { * The matcher dumper used to store the route information. * @param \Drupal\Core\Lock\LockBackendInterface $lock * The lock backend. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $dispatcher * The event dispatcher to notify of routes. * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * The module handler. diff --git a/core/lib/Drupal/Core/Session/AccountProxy.php b/core/lib/Drupal/Core/Session/AccountProxy.php index 2815c63152..7274688706 100644 --- a/core/lib/Drupal/Core/Session/AccountProxy.php +++ b/core/lib/Drupal/Core/Session/AccountProxy.php @@ -3,7 +3,7 @@ namespace Drupal\Core\Session; use Drupal\Core\DependencyInjection\DependencySerializationTrait; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * A proxied implementation of AccountInterface. @@ -37,14 +37,14 @@ class AccountProxy implements AccountProxyInterface { /** * Event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; /** * AccountProxy constructor. * - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $eventDispatcher * Event dispatcher. */ public function __construct(EventDispatcherInterface $eventDispatcher) { diff --git a/core/modules/big_pipe/src/Render/BigPipe.php b/core/modules/big_pipe/src/Render/BigPipe.php index f21640bc4e..38fec0d938 100644 --- a/core/modules/big_pipe/src/Render/BigPipe.php +++ b/core/modules/big_pipe/src/Render/BigPipe.php @@ -11,7 +11,7 @@ use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Render\HtmlResponse; use Drupal\Core\Render\RendererInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\Response; @@ -194,7 +194,7 @@ class BigPipe { /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -216,7 +216,7 @@ class BigPipe { * The request stack. * @param \Symfony\Component\HttpKernel\HttpKernelInterface $http_kernel * The HTTP kernel. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher. * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory * The config factory. diff --git a/core/modules/big_pipe/tests/src/Unit/Render/ManyPlaceholderTest.php b/core/modules/big_pipe/tests/src/Unit/Render/ManyPlaceholderTest.php index fb835e4ce5..28eab58754 100644 --- a/core/modules/big_pipe/tests/src/Unit/Render/ManyPlaceholderTest.php +++ b/core/modules/big_pipe/tests/src/Unit/Render/ManyPlaceholderTest.php @@ -8,7 +8,7 @@ use Drupal\Core\Render\HtmlResponse; use Drupal\Core\Render\RendererInterface; use Drupal\Tests\UnitTestCase; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\Session\SessionInterface; use Symfony\Component\HttpKernel\HttpKernelInterface; diff --git a/core/modules/block_content/src/BlockContentAccessControlHandler.php b/core/modules/block_content/src/BlockContentAccessControlHandler.php index 0c84190997..5ea6cfce1f 100644 --- a/core/modules/block_content/src/BlockContentAccessControlHandler.php +++ b/core/modules/block_content/src/BlockContentAccessControlHandler.php @@ -11,7 +11,7 @@ use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Session\AccountInterface; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * Defines the access control handler for the custom block entity type. @@ -23,7 +23,7 @@ class BlockContentAccessControlHandler extends EntityAccessControlHandler implem /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -32,7 +32,7 @@ class BlockContentAccessControlHandler extends EntityAccessControlHandler implem * * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type * The entity type. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $dispatcher * The event dispatcher. */ public function __construct(EntityTypeInterface $entity_type, EventDispatcherInterface $dispatcher) { diff --git a/core/modules/config/src/Form/ConfigSingleImportForm.php b/core/modules/config/src/Form/ConfigSingleImportForm.php index f4236b5e3b..bf6d650d5f 100644 --- a/core/modules/config/src/Form/ConfigSingleImportForm.php +++ b/core/modules/config/src/Form/ConfigSingleImportForm.php @@ -24,7 +24,7 @@ use Drupal\Core\Serialization\Yaml; use Drupal\Core\Url; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * Provides a form for importing a single configuration file. @@ -57,7 +57,7 @@ class ConfigSingleImportForm extends ConfirmFormBase { /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -133,7 +133,7 @@ class ConfigSingleImportForm extends ConfirmFormBase { * The config storage. * @param \Drupal\Core\Render\RendererInterface $renderer * The renderer service. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher used to notify subscribers of config import events. * @param \Drupal\Core\Config\ConfigManagerInterface $config_manager * The configuration manager. diff --git a/core/modules/config/src/Form/ConfigSync.php b/core/modules/config/src/Form/ConfigSync.php index 70a849c20f..47af171368 100644 --- a/core/modules/config/src/Form/ConfigSync.php +++ b/core/modules/config/src/Form/ConfigSync.php @@ -19,7 +19,7 @@ use Drupal\Core\Config\StorageComparer; use Drupal\Core\Render\RendererInterface; use Drupal\Core\Url; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -60,7 +60,7 @@ class ConfigSync extends FormBase { /** * Event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -131,7 +131,7 @@ class ConfigSync extends FormBase { * The snapshot storage. * @param \Drupal\Core\Lock\LockBackendInterface $lock * The lock object. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * Event dispatcher. * @param \Drupal\Core\Config\ConfigManagerInterface $config_manager * Configuration manager. diff --git a/core/modules/config_translation/src/ConfigEntityMapper.php b/core/modules/config_translation/src/ConfigEntityMapper.php index 9471a62949..cbc716baf2 100644 --- a/core/modules/config_translation/src/ConfigEntityMapper.php +++ b/core/modules/config_translation/src/ConfigEntityMapper.php @@ -13,7 +13,7 @@ use Drupal\Core\Url; use Drupal\locale\LocaleConfigManager; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Routing\Route; /** @@ -74,7 +74,7 @@ class ConfigEntityMapper extends ConfigNamesMapper { * The entity type manager. * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager * The language manager. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher. */ public function __construct($plugin_id, $plugin_definition, ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typed_config, LocaleConfigManager $locale_config_manager, ConfigMapperManagerInterface $config_mapper_manager, RouteProviderInterface $route_provider, TranslationInterface $translation_manager, EntityTypeManagerInterface $entity_type_manager, LanguageManagerInterface $language_manager, EventDispatcherInterface $event_dispatcher = NULL) { diff --git a/core/modules/config_translation/src/ConfigNamesMapper.php b/core/modules/config_translation/src/ConfigNamesMapper.php index 188fd6fc67..a0068ceec8 100644 --- a/core/modules/config_translation/src/ConfigNamesMapper.php +++ b/core/modules/config_translation/src/ConfigNamesMapper.php @@ -17,7 +17,7 @@ use Drupal\Core\Url; use Drupal\locale\LocaleConfigManager; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Routing\Route; use Symfony\Component\Routing\RouteCollection; @@ -92,7 +92,7 @@ class ConfigNamesMapper extends PluginBase implements ConfigMapperInterface, Con /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -125,7 +125,7 @@ class ConfigNamesMapper extends PluginBase implements ConfigMapperInterface, Con * The string translation manager. * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager * The language manager. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * (optional) The event dispatcher. * * @throws \Symfony\Component\Routing\Exception\RouteNotFoundException diff --git a/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php index 6dc7abdc6d..2e8260bdde 100644 --- a/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php +++ b/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php @@ -52,7 +52,7 @@ class ConfigEntityMapperTest extends UnitTestCase { /** * The mocked event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $eventDispatcher; @@ -86,7 +86,7 @@ protected function setUp(): void { $this->languageManager = $this->createMock('Drupal\Core\Language\LanguageManagerInterface'); - $this->eventDispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); + $this->eventDispatcher = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface'); $this->configEntityMapper = new ConfigEntityMapper( 'configurable_language', diff --git a/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php index 3c45cf0800..e1f9b16ecd 100644 --- a/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php +++ b/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php @@ -38,7 +38,7 @@ class ConfigFieldMapperTest extends UnitTestCase { /** * The mocked event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $eventDispatcher; @@ -61,7 +61,7 @@ protected function setUp(): void { ->disableOriginalConstructor() ->getMock(); - $this->eventDispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); + $this->eventDispatcher = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface'); $this->configFieldMapper = new ConfigFieldMapper( 'node_fields', diff --git a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php index 51697f01a2..b50419d418 100644 --- a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php +++ b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php @@ -91,7 +91,7 @@ class ConfigNamesMapperTest extends UnitTestCase { /** * The mocked event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $eventDispatcher; @@ -129,7 +129,7 @@ protected function setUp(): void { $this->languageManager = $this->createMock('Drupal\Core\Language\LanguageManagerInterface'); - $this->eventDispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); + $this->eventDispatcher = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface'); $this->configNamesMapper = new TestConfigNamesMapper( 'system.site_information_settings', diff --git a/core/modules/jsonapi/src/ResourceType/ResourceTypeRepository.php b/core/modules/jsonapi/src/ResourceType/ResourceTypeRepository.php index c2d306d4b9..8a80c36f02 100644 --- a/core/modules/jsonapi/src/ResourceType/ResourceTypeRepository.php +++ b/core/modules/jsonapi/src/ResourceType/ResourceTypeRepository.php @@ -15,7 +15,7 @@ use Drupal\Core\Entity\FieldableEntityInterface; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\TypedData\DataReferenceTargetDefinition; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpKernel\Exception\PreconditionFailedHttpException; /** @@ -71,7 +71,7 @@ class ResourceTypeRepository implements ResourceTypeRepositoryInterface { /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -101,7 +101,7 @@ class ResourceTypeRepository implements ResourceTypeRepositoryInterface { * The entity field manager. * @param \Drupal\Core\Cache\CacheBackendInterface $cache * The cache backend. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $dispatcher * The event dispatcher. */ public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $entity_bundle_info, EntityFieldManagerInterface $entity_field_manager, CacheBackendInterface $cache, EventDispatcherInterface $dispatcher) { diff --git a/core/modules/language/src/Config/LanguageConfigFactoryOverride.php b/core/modules/language/src/Config/LanguageConfigFactoryOverride.php index 3c7010d034..67ae7dfa99 100644 --- a/core/modules/language/src/Config/LanguageConfigFactoryOverride.php +++ b/core/modules/language/src/Config/LanguageConfigFactoryOverride.php @@ -11,7 +11,7 @@ use Drupal\Core\Config\TypedConfigManagerInterface; use Drupal\Core\Language\LanguageDefault; use Drupal\Core\Language\LanguageInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** @@ -48,7 +48,7 @@ class LanguageConfigFactoryOverride extends ConfigFactoryOverrideBase implements /** * An event dispatcher instance to use for configuration events. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -64,7 +64,7 @@ class LanguageConfigFactoryOverride extends ConfigFactoryOverrideBase implements * * @param \Drupal\Core\Config\StorageInterface $storage * The configuration storage engine. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * An event dispatcher instance to use for configuration events. * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_config * The typed configuration manager. diff --git a/core/modules/language/src/Config/LanguageConfigOverride.php b/core/modules/language/src/Config/LanguageConfigOverride.php index 01cd56c7e6..3b3b4da3c6 100644 --- a/core/modules/language/src/Config/LanguageConfigOverride.php +++ b/core/modules/language/src/Config/LanguageConfigOverride.php @@ -6,7 +6,7 @@ use Drupal\Core\Config\StorableConfigBase; use Drupal\Core\Config\StorageInterface; use Drupal\Core\Config\TypedConfigManagerInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * Defines language configuration overrides. @@ -18,7 +18,7 @@ class LanguageConfigOverride extends StorableConfigBase { /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -32,7 +32,7 @@ class LanguageConfigOverride extends StorableConfigBase { * configuration override. * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_config * The typed configuration manager service. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher. */ public function __construct($name, StorageInterface $storage, TypedConfigManagerInterface $typed_config, EventDispatcherInterface $event_dispatcher) { diff --git a/core/modules/language/tests/src/Unit/Config/LanguageConfigOverrideTest.php b/core/modules/language/tests/src/Unit/Config/LanguageConfigOverrideTest.php index fac22730af..2f789cdc8f 100644 --- a/core/modules/language/tests/src/Unit/Config/LanguageConfigOverrideTest.php +++ b/core/modules/language/tests/src/Unit/Config/LanguageConfigOverrideTest.php @@ -30,7 +30,7 @@ class LanguageConfigOverrideTest extends UnitTestCase { /** * Event Dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $eventDispatcher; @@ -53,7 +53,7 @@ class LanguageConfigOverrideTest extends UnitTestCase { */ protected function setUp(): void { $this->storage = $this->createMock('Drupal\Core\Config\StorageInterface'); - $this->eventDispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); + $this->eventDispatcher = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface'); $this->typedConfig = $this->createMock('\Drupal\Core\Config\TypedConfigManagerInterface'); $this->configTranslation = new LanguageConfigOverride('config.test', $this->storage, $this->typedConfig, $this->eventDispatcher); $this->cacheTagsInvalidator = $this->createMock('Drupal\Core\Cache\CacheTagsInvalidatorInterface'); diff --git a/core/modules/layout_builder/src/Element/LayoutBuilder.php b/core/modules/layout_builder/src/Element/LayoutBuilder.php index 0814604bbc..ad737d2e64 100644 --- a/core/modules/layout_builder/src/Element/LayoutBuilder.php +++ b/core/modules/layout_builder/src/Element/LayoutBuilder.php @@ -14,7 +14,7 @@ use Drupal\layout_builder\LayoutBuilderHighlightTrait; use Drupal\layout_builder\SectionStorageInterface; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * Defines a render element for building the Layout Builder UI. @@ -33,7 +33,7 @@ class LayoutBuilder extends RenderElement implements ContainerFactoryPluginInter /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -46,7 +46,7 @@ class LayoutBuilder extends RenderElement implements ContainerFactoryPluginInter * The plugin ID for the plugin instance. * @param mixed $plugin_definition * The plugin implementation definition. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher service. * @param \Drupal\Core\Messenger\MessengerInterface|null $messenger * The messenger service. This is no longer used and will be removed in diff --git a/core/modules/layout_builder/src/SectionComponent.php b/core/modules/layout_builder/src/SectionComponent.php index c09492e3ab..b14fc6ae3d 100644 --- a/core/modules/layout_builder/src/SectionComponent.php +++ b/core/modules/layout_builder/src/SectionComponent.php @@ -272,7 +272,7 @@ protected function contextHandler() { /** * Wraps the event dispatcher. * - * @return \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @return \Symfony\Contracts\EventDispatcher\EventDispatcherInterface * The event dispatcher. */ protected function eventDispatcher() { diff --git a/core/modules/layout_builder/tests/src/Kernel/LayoutBuilderElementTest.php b/core/modules/layout_builder/tests/src/Kernel/LayoutBuilderElementTest.php index 5748a99c43..a7672ffec8 100644 --- a/core/modules/layout_builder/tests/src/Kernel/LayoutBuilderElementTest.php +++ b/core/modules/layout_builder/tests/src/Kernel/LayoutBuilderElementTest.php @@ -6,7 +6,7 @@ use Drupal\KernelTests\KernelTestBase; use Drupal\layout_builder\Element\LayoutBuilder; use Drupal\layout_builder\LayoutTempstoreRepositoryInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * Tests the deprecation notices of the layout builder element. diff --git a/core/modules/layout_builder/tests/src/Unit/SectionComponentTest.php b/core/modules/layout_builder/tests/src/Unit/SectionComponentTest.php index ca2138ec9e..07364d9ad9 100644 --- a/core/modules/layout_builder/tests/src/Unit/SectionComponentTest.php +++ b/core/modules/layout_builder/tests/src/Unit/SectionComponentTest.php @@ -12,7 +12,7 @@ use Drupal\layout_builder\SectionComponent; use Drupal\Tests\UnitTestCase; use Prophecy\Argument; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * @coversDefaultClass \Drupal\layout_builder\SectionComponent diff --git a/core/modules/migrate/src/MigrateExecutable.php b/core/modules/migrate/src/MigrateExecutable.php index 4f75c9486e..a2f29ed724 100644 --- a/core/modules/migrate/src/MigrateExecutable.php +++ b/core/modules/migrate/src/MigrateExecutable.php @@ -14,7 +14,7 @@ use Drupal\migrate\Exception\RequirementsException; use Drupal\migrate\Plugin\MigrateIdMapInterface; use Drupal\migrate\Plugin\MigrationInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * Defines a migrate executable class. @@ -77,7 +77,7 @@ class MigrateExecutable implements MigrateExecutableInterface { /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -97,7 +97,7 @@ class MigrateExecutable implements MigrateExecutableInterface { * The migration to run. * @param \Drupal\migrate\MigrateMessageInterface $message * (optional) The migrate message service. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * (optional) The event dispatcher. * * @throws \Drupal\migrate\MigrateException @@ -135,7 +135,7 @@ protected function getSource() { /** * Gets the event dispatcher. * - * @return \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @return \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected function getEventDispatcher() { if (!$this->eventDispatcher) { diff --git a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php index 6675ec8947..93e3f01b3b 100644 --- a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php +++ b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php @@ -19,7 +19,7 @@ use Drupal\migrate\Event\MigrateMapSaveEvent; use Drupal\migrate\Event\MigrateMapDeleteEvent; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * Defines the sql based ID map implementation. @@ -39,7 +39,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP /** * An event dispatcher instance to use for map events. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -154,7 +154,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP * The configuration for the plugin. * @param \Drupal\migrate\Plugin\MigrationInterface $migration * The migration to do. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher. */ public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EventDispatcherInterface $event_dispatcher) { diff --git a/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php b/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php index 68bf7d02d6..8673eaee64 100644 --- a/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php +++ b/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php @@ -52,7 +52,7 @@ protected function setUp(): void { parent::setUp(); $this->migration = $this->getMigration(); $this->message = $this->createMock('Drupal\migrate\MigrateMessageInterface'); - $event_dispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); + $event_dispatcher = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface'); $this->executable = new TestMigrateExecutable($this->migration, $this->message, $event_dispatcher); $this->executable->setStringTranslation($this->getStringTranslationStub()); } diff --git a/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php b/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php index 466786cfcc..b923d1fea6 100644 --- a/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php +++ b/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php @@ -444,8 +444,8 @@ public function testDefaultPropertiesValues() { protected function getMigrateExecutable($migration) { /** @var \Drupal\migrate\MigrateMessageInterface $message */ $message = $this->createMock('Drupal\migrate\MigrateMessageInterface'); - /** @var \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher */ - $event_dispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); + /** @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher */ + $event_dispatcher = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface'); return new MigrateExecutable($migration, $message, $event_dispatcher); } diff --git a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapEnsureTablesTest.php b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapEnsureTablesTest.php index 44eeccb7c1..e674ef4df7 100644 --- a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapEnsureTablesTest.php +++ b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapEnsureTablesTest.php @@ -230,8 +230,8 @@ protected function runEnsureTablesTest($schema) { $migration->expects($this->any()) ->method('getDestinationPlugin') ->willReturn($plugin); - /** @var \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher */ - $event_dispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); + /** @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher */ + $event_dispatcher = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface'); $map = new TestSqlIdMap($database, [], 'sql', [], $migration, $event_dispatcher); $map->getDatabase(); } diff --git a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php index cd27e10597..4d598d05d0 100644 --- a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php +++ b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php @@ -110,7 +110,7 @@ protected function getIdMap() { $migration ->method('getDestinationPlugin') ->willReturn($plugin); - $event_dispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); + $event_dispatcher = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface'); $id_map = new TestSqlIdMap($this->database, [], 'sql', [], $migration, $event_dispatcher); $migration diff --git a/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php b/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php index 1adc95522f..78bdb9e7c3 100644 --- a/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php +++ b/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php @@ -6,7 +6,7 @@ use Drupal\migrate\Plugin\MigrationInterface; use Drupal\migrate\MigrateException; use Drupal\migrate\Plugin\migrate\id_map\Sql; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * Defines a SQL ID map for use in tests. @@ -26,7 +26,7 @@ class TestSqlIdMap extends Sql implements \Iterator { * The configuration for the plugin. * @param \Drupal\migrate\Plugin\MigrationInterface $migration * The migration to do. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher service. */ public function __construct(Connection $database, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EventDispatcherInterface $event_dispatcher) { diff --git a/core/modules/migrate/tests/src/Unit/process/SubProcessTest.php b/core/modules/migrate/tests/src/Unit/process/SubProcessTest.php index c7edcbecfb..9563e78e2c 100644 --- a/core/modules/migrate/tests/src/Unit/process/SubProcessTest.php +++ b/core/modules/migrate/tests/src/Unit/process/SubProcessTest.php @@ -8,7 +8,7 @@ use Drupal\migrate\Plugin\migrate\process\SubProcess; use Drupal\migrate\Row; use Drupal\Tests\migrate\Unit\MigrateTestCase; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * Tests the sub_process process plugin. diff --git a/core/modules/user/src/UserFloodControl.php b/core/modules/user/src/UserFloodControl.php index c5f79b7bf7..08c0f3a141 100644 --- a/core/modules/user/src/UserFloodControl.php +++ b/core/modules/user/src/UserFloodControl.php @@ -5,7 +5,7 @@ use Drupal\user\Event\UserEvents; use Drupal\user\Event\UserFloodEvent; use Drupal\Core\Flood\FloodInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\RequestStack; /** @@ -25,7 +25,7 @@ class UserFloodControl implements UserFloodControlInterface { /** * Event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; @@ -41,7 +41,7 @@ class UserFloodControl implements UserFloodControlInterface { * * @param \Drupal\Core\Flood\FloodInterface $flood * The flood service. - * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher + * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher * The event dispatcher service. * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack * The request stack used to retrieve the current request. diff --git a/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php b/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php index fec962da58..abf27f2055 100644 --- a/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php +++ b/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php @@ -43,7 +43,7 @@ class ViewsEntitySchemaSubscriberIntegrationTest extends ViewsKernelTestBase { /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; diff --git a/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php b/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php index 31fb5a5f8f..89f8f6e867 100644 --- a/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php +++ b/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php @@ -8,7 +8,6 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Symfony\Component\EventDispatcher\Event as SymfonyEvent; use Symfony\Component\EventDispatcher\GenericEvent; use Drupal\Component\EventDispatcher\Event; @@ -142,30 +141,6 @@ public function testGetListenersWithServices() { $this->assertSame($expectedListeners, $actualListeners); } - /** - * Tests argument order deprecation. - * - * @group legacy - * @expectedDeprecation Calling the Symfony\Component\EventDispatcher\EventDispatcherInterface::dispatch() method with a string event name as the first argument is deprecated in drupal:9.1.0, an Event object will be required instead in drupal:10.0.0. See https://www.drupal.org/node/3154407 - */ - public function testDispatchArgumentOrderDeprecation() { - $container = new ContainerBuilder(); - $dispatcher = new ContainerAwareEventDispatcher($container, []); - $dispatcher->dispatch('foo'); - } - - /** - * Tests deprecation notice for Symfony Event class. - * - * @group legacy - * @expectedDeprecation Symfony\Component\EventDispatcher\Event is deprecated in drupal:9.1.0 and will be replaced by Symfony\Contracts\EventDispatcher\Event in drupal:10.0.0. A new Drupal\Component\EventDispatcher\Event class is available to bridge the two versions of the class. See https://www.drupal.org/node/3159012 - */ - public function testSymfonyEventDeprecation() { - $container = new ContainerBuilder(); - $dispatcher = new ContainerAwareEventDispatcher($container, []); - $dispatcher->dispatch(new SymfonyEvent()); - } - /** * Tests dispatching Symfony events with core's event dispatcher. */ @@ -175,18 +150,6 @@ public function testSymfonyEventDispatching() { $dispatcher->dispatch(new GenericEvent()); } - /** - * Tests deprecation notice for Symfony Event class inheritance. - * - * @group legacy - * @expectedDeprecation Symfony\Component\EventDispatcher\Event is deprecated in drupal:9.1.0 and will be replaced by Symfony\Contracts\EventDispatcher\Event in drupal:10.0.0. A new Drupal\Component\EventDispatcher\Event class is available to bridge the two versions of the class. See https://www.drupal.org/node/3159012 - */ - public function testSymfonyInheritedEventDeprecation() { - $container = new ContainerBuilder(); - $dispatcher = new ContainerAwareEventDispatcher($container, []); - $dispatcher->dispatch(new SymfonyInheritedEvent()); - } - public function testDispatchWithServices() { $container = new ContainerBuilder(); $container->register('listener_service', TestEventListener::class); @@ -647,5 +610,3 @@ public static function getSubscribedEvents() { } } - -class SymfonyInheritedEvent extends SymfonyEvent {} diff --git a/core/tests/Drupal/Tests/Core/Config/ConfigFactoryTest.php b/core/tests/Drupal/Tests/Core/Config/ConfigFactoryTest.php index c072052c7e..21db97bb16 100644 --- a/core/tests/Drupal/Tests/Core/Config/ConfigFactoryTest.php +++ b/core/tests/Drupal/Tests/Core/Config/ConfigFactoryTest.php @@ -30,7 +30,7 @@ class ConfigFactoryTest extends UnitTestCase { /** * Event Dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $eventDispatcher; @@ -53,7 +53,7 @@ class ConfigFactoryTest extends UnitTestCase { */ protected function setUp(): void { $this->storage = $this->createMock('Drupal\Core\Config\StorageInterface'); - $this->eventDispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); + $this->eventDispatcher = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface'); $this->typedConfig = $this->createMock('\Drupal\Core\Config\TypedConfigManagerInterface'); $this->configFactory = new ConfigFactory($this->storage, $this->eventDispatcher, $this->typedConfig); diff --git a/core/tests/Drupal/Tests/Core/Config/ConfigTest.php b/core/tests/Drupal/Tests/Core/Config/ConfigTest.php index ac09beb7a6..40c4352585 100644 --- a/core/tests/Drupal/Tests/Core/Config/ConfigTest.php +++ b/core/tests/Drupal/Tests/Core/Config/ConfigTest.php @@ -37,7 +37,7 @@ class ConfigTest extends UnitTestCase { /** * Event Dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $eventDispatcher; @@ -57,7 +57,7 @@ class ConfigTest extends UnitTestCase { protected function setUp(): void { $this->storage = $this->createMock('Drupal\Core\Config\StorageInterface'); - $this->eventDispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); + $this->eventDispatcher = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface'); $this->typedConfig = $this->createMock('\Drupal\Core\Config\TypedConfigManagerInterface'); $this->config = new Config('config.test', $this->storage, $this->eventDispatcher, $this->typedConfig); $this->cacheTagsInvalidator = $this->createMock('Drupal\Core\Cache\CacheTagsInvalidatorInterface'); diff --git a/core/tests/Drupal/Tests/Core/Config/ImmutableConfigTest.php b/core/tests/Drupal/Tests/Core/Config/ImmutableConfigTest.php index 8b31194825..b8f92f0bf0 100644 --- a/core/tests/Drupal/Tests/Core/Config/ImmutableConfigTest.php +++ b/core/tests/Drupal/Tests/Core/Config/ImmutableConfigTest.php @@ -22,7 +22,7 @@ class ImmutableConfigTest extends UnitTestCase { protected function setUp(): void { parent::setUp(); $storage = $this->createMock('Drupal\Core\Config\StorageInterface'); - $event_dispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); + $event_dispatcher = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface'); $typed_config = $this->createMock('Drupal\Core\Config\TypedConfigManagerInterface'); $this->config = new ImmutableConfig('test', $storage, $event_dispatcher, $typed_config); } diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php index 9456586b65..0980d88385 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php @@ -89,7 +89,7 @@ class EntityFieldManagerTest extends UnitTestCase { /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface|\Prophecy\Prophecy\ProphecyInterface + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface|\Prophecy\Prophecy\ProphecyInterface */ protected $eventDispatcher; diff --git a/core/tests/Drupal/Tests/Core/Form/FormTestBase.php b/core/tests/Drupal/Tests/Core/Form/FormTestBase.php index 56264ece28..c5db4a1f9d 100644 --- a/core/tests/Drupal/Tests/Core/Form/FormTestBase.php +++ b/core/tests/Drupal/Tests/Core/Form/FormTestBase.php @@ -115,7 +115,7 @@ abstract class FormTestBase extends UnitTestCase { /** * The event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $eventDispatcher; @@ -174,7 +174,7 @@ protected function setUp() { $this->account = $this->createMock('Drupal\Core\Session\AccountInterface'); $this->themeManager = $this->createMock('Drupal\Core\Theme\ThemeManagerInterface'); $this->request = Request::createFromGlobals(); - $this->eventDispatcher = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); + $this->eventDispatcher = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface'); $this->requestStack = new RequestStack(); $this->requestStack->push($this->request); $this->logger = $this->createMock('Drupal\Core\Logger\LoggerChannelInterface'); diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecoratorTest.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecoratorTest.php index 938fbbc01b..50e8ebcb1f 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecoratorTest.php +++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecoratorTest.php @@ -15,7 +15,7 @@ class ContainerDerivativeDiscoveryDecoratorTest extends UnitTestCase { * @covers ::getDefinitions */ public function testGetDefinitions() { - $example_service = $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); + $example_service = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface'); $example_container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder') ->setMethods(['get']) ->getMock(); diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestContainerDerivativeDiscovery.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestContainerDerivativeDiscovery.php index da7eed1962..9c3c3c348c 100644 --- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestContainerDerivativeDiscovery.php +++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestContainerDerivativeDiscovery.php @@ -4,7 +4,7 @@ use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; /** * Defines container test derivative discovery. @@ -14,7 +14,7 @@ class TestContainerDerivativeDiscovery extends TestDerivativeDiscovery implement /** * Constructs a TestContainerDerivativeDiscovery object. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface $example_service + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $example_service * Some service. */ public function __construct(EventDispatcherInterface $example_service) { diff --git a/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php b/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php index 7682bfdd0f..59d4367e7e 100644 --- a/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php +++ b/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php @@ -47,7 +47,7 @@ class RouteBuilderTest extends UnitTestCase { /** * The mocked event dispatcher. * - * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject + * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $dispatcher; @@ -80,7 +80,7 @@ class RouteBuilderTest extends UnitTestCase { protected function setUp(): void { $this->dumper = $this->createMock('Drupal\Core\Routing\MatcherDumperInterface'); $this->lock = $this->createMock('Drupal\Core\Lock\LockBackendInterface'); - $this->dispatcher = $this->createMock('\Symfony\Component\EventDispatcher\EventDispatcherInterface'); + $this->dispatcher = $this->createMock('\Symfony\Contracts\EventDispatcher\EventDispatcherInterface'); $this->moduleHandler = $this->createMock('Drupal\Core\Extension\ModuleHandlerInterface'); $this->controllerResolver = $this->createMock('Drupal\Core\Controller\ControllerResolverInterface'); $this->yamlDiscovery = $this->getMockBuilder('\Drupal\Core\Discovery\YamlDiscovery') diff --git a/core/tests/Drupal/Tests/Core/Session/AccountProxyTest.php b/core/tests/Drupal/Tests/Core/Session/AccountProxyTest.php index ae233a5cb9..47eaf96d4b 100644 --- a/core/tests/Drupal/Tests/Core/Session/AccountProxyTest.php +++ b/core/tests/Drupal/Tests/Core/Session/AccountProxyTest.php @@ -5,7 +5,9 @@ use Drupal\Core\Session\AccountInterface; use Drupal\Core\Session\AccountProxy; use Drupal\Tests\UnitTestCase; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Prophecy\Argument; +use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; +use Symfony\Contracts\EventDispatcher\Event; /** * @coversDefaultClass \Drupal\Core\Session\AccountProxy @@ -19,6 +21,7 @@ class AccountProxyTest extends UnitTestCase { */ public function testId() { $dispatcher = $this->prophesize(EventDispatcherInterface::class); + $dispatcher->dispatch(Argument::any(), Argument::any())->willReturn(new Event()); $account_proxy = new AccountProxy($dispatcher->reveal()); $this->assertSame(0, $account_proxy->id()); $account_proxy->setInitialAccountId(1); @@ -39,6 +42,7 @@ public function testId() { public function testSetInitialAccountIdException() { $this->expectException(\LogicException::class); $dispatcher = $this->prophesize(EventDispatcherInterface::class); + $dispatcher->dispatch(Argument::any(), Argument::any())->willReturn(new Event()); $account_proxy = new AccountProxy($dispatcher->reveal()); $current_user = $this->prophesize(AccountInterface::class); $account_proxy->setAccount($current_user->reveal()); diff --git a/core/tests/bootstrap.php b/core/tests/bootstrap.php index 6fd5f47630..fbfb9a2a52 100644 --- a/core/tests/bootstrap.php +++ b/core/tests/bootstrap.php @@ -79,7 +79,7 @@ function drupal_phpunit_contrib_extension_directory_roots($root = NULL) { * An associative array of extension directories, keyed by their namespace. */ function drupal_phpunit_get_extension_namespaces($dirs) { - $suite_names = ['Unit', 'Kernel', 'Functional', 'Build', 'FunctionalJavascript']; + $suite_names = ['Unit', 'Kernel']; $namespaces = []; foreach ($dirs as $extension => $dir) { if (is_dir($dir . '/src')) {