From e6a4526fa3f2fad5f84b01f226095877b21b07d8 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Thu, 30 May 2019 00:41:18 +0200 Subject: [PATCH] Marked several components as incompatible with EventDispatcher 5. --- src/Symfony/Component/Console/composer.json | 4 ++-- src/Symfony/Component/Form/composer.json | 2 +- src/Symfony/Component/HttpKernel/composer.json | 2 +- src/Symfony/Component/Mailer/composer.json | 2 +- src/Symfony/Component/Security/Core/composer.json | 4 ++-- src/Symfony/Component/Security/Http/composer.json | 1 + src/Symfony/Component/Security/composer.json | 3 +++ src/Symfony/Component/Workflow/composer.json | 4 ++-- 8 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json index 0a18e78147..a38991dbc6 100644 --- a/src/Symfony/Component/Console/composer.json +++ b/src/Symfony/Component/Console/composer.json @@ -23,7 +23,7 @@ }, "require-dev": { "symfony/config": "^3.4|^4.0|^5.0", - "symfony/event-dispatcher": "^4.3|^5.0", + "symfony/event-dispatcher": "^4.3", "symfony/dependency-injection": "^3.4|^4.0|^5.0", "symfony/lock": "^3.4|^4.0|^5.0", "symfony/process": "^3.4|^4.0|^5.0", @@ -41,7 +41,7 @@ }, "conflict": { "symfony/dependency-injection": "<3.4", - "symfony/event-dispatcher": "<4.3", + "symfony/event-dispatcher": "<4.3|>=5", "symfony/process": "<3.3" }, "autoload": { diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index b7a812a266..a4f4fd0768 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": "^7.1.3", - "symfony/event-dispatcher": "^4.3|^5.0", + "symfony/event-dispatcher": "^4.3", "symfony/intl": "^4.3|^5.0", "symfony/options-resolver": "~4.3|^5.0", "symfony/polyfill-ctype": "~1.8", diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index 42027950c2..e1200e3661 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": "^7.1.3", - "symfony/event-dispatcher": "^4.3|^5.0", + "symfony/event-dispatcher": "^4.3", "symfony/http-foundation": "^4.1.1|^5.0", "symfony/debug": "^3.4|^4.0|^5.0", "symfony/polyfill-ctype": "^1.8", diff --git a/src/Symfony/Component/Mailer/composer.json b/src/Symfony/Component/Mailer/composer.json index 409918fb29..1de10720be 100644 --- a/src/Symfony/Component/Mailer/composer.json +++ b/src/Symfony/Component/Mailer/composer.json @@ -19,7 +19,7 @@ "php": "^7.1.3", "egulias/email-validator": "^2.0", "psr/log": "~1.0", - "symfony/event-dispatcher": "^4.3|^5.0", + "symfony/event-dispatcher": "^4.3", "symfony/mime": "^4.3|^5.0" }, "require-dev": { diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json index 69c77dbceb..73f8078ab5 100644 --- a/src/Symfony/Component/Security/Core/composer.json +++ b/src/Symfony/Component/Security/Core/composer.json @@ -22,7 +22,7 @@ }, "require-dev": { "psr/container": "^1.0", - "symfony/event-dispatcher": "^4.3|^5.0", + "symfony/event-dispatcher": "^4.3", "symfony/expression-language": "^3.4|^4.0|^5.0", "symfony/http-foundation": "^3.4|^4.0|^5.0", "symfony/ldap": "^3.4|^4.0|^5.0", @@ -30,7 +30,7 @@ "psr/log": "~1.0" }, "conflict": { - "symfony/event-dispatcher": "<4.3", + "symfony/event-dispatcher": "<4.3|>=5", "symfony/security-guard": "<4.3" }, "suggest": { diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json index e4a0fd5e30..ec928c7c65 100644 --- a/src/Symfony/Component/Security/Http/composer.json +++ b/src/Symfony/Component/Security/Http/composer.json @@ -28,6 +28,7 @@ "psr/log": "~1.0" }, "conflict": { + "symfony/event-dispatcher": ">=5", "symfony/security-csrf": "<3.4.11|~4.0,<4.0.11" }, "suggest": { diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index e52a5828f6..84d534b879 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -40,6 +40,9 @@ "symfony/ldap": "^3.4|^4.0|^5.0", "psr/log": "~1.0" }, + "conflict": { + "symfony/event-dispatcher": ">=5" + }, "suggest": { "psr/container-implementation": "To instantiate the Security class", "symfony/form": "", diff --git a/src/Symfony/Component/Workflow/composer.json b/src/Symfony/Component/Workflow/composer.json index f98c6464bf..684f7657d3 100644 --- a/src/Symfony/Component/Workflow/composer.json +++ b/src/Symfony/Component/Workflow/composer.json @@ -26,13 +26,13 @@ "require-dev": { "psr/log": "~1.0", "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/event-dispatcher": "^4.3|^5.0", + "symfony/event-dispatcher": "^4.3", "symfony/expression-language": "^3.4|^4.0|^5.0", "symfony/security-core": "^3.4|^4.0|^5.0", "symfony/validator": "^3.4|^4.0|^5.0" }, "conflict": { - "symfony/event-dispatcher": "<4.3" + "symfony/event-dispatcher": "<4.3|>=5" }, "autoload": { "psr-4": { "Symfony\\Component\\Workflow\\": "" }