diff --git a/composer.json b/composer.json index bd2e3e465..415df800f 100644 --- a/composer.json +++ b/composer.json @@ -38,11 +38,10 @@ "react/promise": "^1.2 || ^2.7" }, "conflict": { - "symfony/console": "2.8.38", - "symfony/phpunit-bridge": "3.4.40" + "symfony/console": "2.8.38" }, "require-dev": { - "symfony/phpunit-bridge": "^3.4", + "symfony/phpunit-bridge": "^4.2 || ^5", "phpspec/prophecy": "^1.10" }, "suggest": { diff --git a/composer.lock b/composer.lock index 3841369fb..4f27da9f3 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": "08293668540de913642a19e6af165dd0", + "content-hash": "a5f07d1ae8479fae25dd57b2d966cd22", "packages": [ { "name": "composer/ca-bundle", @@ -1423,23 +1423,23 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v3.4.39", + "version": "v4.2.12", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "c02893ae43532b46a4f0e0f207d088b939f278d9" + "reference": "80f9ffa6afcc27c7b00e8b8446b1d5d48d94bae7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/c02893ae43532b46a4f0e0f207d088b939f278d9", - "reference": "c02893ae43532b46a4f0e0f207d088b939f278d9", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/80f9ffa6afcc27c7b00e8b8446b1d5d48d94bae7", + "reference": "80f9ffa6afcc27c7b00e8b8446b1d5d48d94bae7", "shasum": "" }, "require": { "php": ">=5.3.3" }, "conflict": { - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0|<6.4,>=6.0" + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" }, "suggest": { "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" @@ -1450,7 +1450,7 @@ "type": "symfony-bridge", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.2-dev" }, "thanks": { "name": "phpunit/phpunit", @@ -1485,23 +1485,9 @@ "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v3.4.38" + "source": "https://github.com/symfony/phpunit-bridge/tree/4.2" }, - "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-02-21T08:01:47+00:00" + "time": "2019-07-05T06:33:37+00:00" } ], "aliases": [],