From 2490a857cb3cdeeabfc8bc3c47cac44ec81a9532 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 3 Jun 2020 10:24:27 +0200 Subject: [PATCH] Bump phpunit-bridge version --- composer.json | 5 ++--- composer.lock | 30 ++++++++---------------------- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index 4fdbcb743..05fc9b85a 100644 --- a/composer.json +++ b/composer.json @@ -37,11 +37,10 @@ "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0" }, "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", "phpspec/prophecy": "^1.10" }, "suggest": { diff --git a/composer.lock b/composer.lock index 1a5309f88..32344435f 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": "281c2bedcde245309c1f9c884f65e1a1", + "content-hash": "9bdad77d200af5af7d93ddd289acd4f6", "packages": [ { "name": "composer/ca-bundle", @@ -1345,23 +1345,23 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v3.4.41", + "version": "v4.2.12", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "f926812c6b3d456dfbd13c706293f49e9a10bc2a" + "reference": "80f9ffa6afcc27c7b00e8b8446b1d5d48d94bae7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/f926812c6b3d456dfbd13c706293f49e9a10bc2a", - "reference": "f926812c6b3d456dfbd13c706293f49e9a10bc2a", + "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|9.1.2" + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" }, "suggest": { "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" @@ -1372,7 +1372,7 @@ "type": "symfony-bridge", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.2-dev" }, "thanks": { "name": "phpunit/phpunit", @@ -1406,21 +1406,7 @@ ], "description": "Symfony PHPUnit Bridge", "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-05-21T18:33:26+00:00" + "time": "2019-07-05T06:33:37+00:00" } ], "aliases": [],