diff --git a/composer.json b/composer.json index a2d867dce82675079ca75a1e62d85e550d0c2688..91ad92035201f8ce30d1701a55532e1a85157f08 100644 --- a/composer.json +++ b/composer.json @@ -84,7 +84,8 @@ "ext-mysqli": "" }, "conflict": { - "symfony/finder": "2.7.44 || 2.8.37 || 3.4.7 || 4.0.7" + "symfony/finder": "2.7.44 || 2.8.37 || 3.4.7 || 4.0.7", + "symfony/routing": "4.2.7" }, "extra": { "typo3/class-alias-loader": { diff --git a/composer.lock b/composer.lock index b45b00c551e8b4af1d90ffe238faa5ba482b40e0..a2085410e6adb18886c9c8168a471e9c320a8874 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": "a25846e6597522c803e2e867551c3531", + "content-hash": "c35f3fa1a21d51fe53bef3a32a429a5f", "packages": [ { "name": "cogpowered/finediff", @@ -3442,12 +3442,12 @@ "version": "v1.6.5", "source": { "type": "git", - "url": "https://github.com/mikey179/vfsStream.git", + "url": "https://github.com/bovigo/vfsStream.git", "reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mikey179/vfsStream/zipball/d5fec95f541d4d71c4823bb5e30cf9b9e5b96145", + "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/d5fec95f541d4d71c4823bb5e30cf9b9e5b96145", "reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145", "shasum": "" }, diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json index b7a874e983d4dc697b6b555b560083c5456f677c..b013e833275989e09e3a888e035673031529a00c 100644 --- a/typo3/sysext/core/composer.json +++ b/typo3/sysext/core/composer.json @@ -64,7 +64,8 @@ }, "conflict": { "symfony/finder": "2.7.44 || 2.8.37 || 3.4.7 || 4.0.7", - "typo3/cms": "*" + "typo3/cms": "*", + "symfony/routing": "4.2.7" }, "replace": { "core": "*",