From 30336ead94e6a4014d3e21d3148c5ebb4bfe497f Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Tue, 22 Aug 2017 18:43:40 +0200 Subject: [PATCH] install PHPUnit 6 on PHP 7.2 --- src/Symfony/Bridge/PhpUnit/CHANGELOG.md | 5 +++++ src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bridge/PhpUnit/CHANGELOG.md b/src/Symfony/Bridge/PhpUnit/CHANGELOG.md index 1cb07da782b6d..7f1ac2e3fa9c3 100644 --- a/src/Symfony/Bridge/PhpUnit/CHANGELOG.md +++ b/src/Symfony/Bridge/PhpUnit/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +3.4.0 +----- + + * PHPUnit 6 is installed when using PHP 7.2+ + 3.3.0 ----- diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit index 4683682a1bf6e..c19d30f4af9e6 100755 --- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit +++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit @@ -15,8 +15,17 @@ error_reporting(-1); -// PHPUnit 4.8 does not support PHP 7, while 5.1 requires PHP 5.6+ -$PHPUNIT_VERSION = PHP_VERSION_ID >= 50600 ? getenv('SYMFONY_PHPUNIT_VERSION') ?: '5.7' : '4.8'; +if (PHP_VERSION_ID >= 70200) { + // PHPUnit 6 is required for PHP 7.2+ + $PHPUNIT_VERSION = getenv('SYMFONY_PHPUNIT_VERSION') ?: '6.3'; +} elseif (PHP_VERSION_ID >= 50600) { + // PHPUnit 4 does not support PHP 7 + $PHPUNIT_VERSION = getenv('SYMFONY_PHPUNIT_VERSION') ?: '5.7'; +} else { + // PHPUnit 5.1 requires PHP 5.6+ + $PHPUNIT_VERSION = '4.8'; +} + $oldPwd = getcwd(); $PHPUNIT_DIR = getenv('SYMFONY_PHPUNIT_DIR') ?: (__DIR__.'/.phpunit'); $PHP = defined('PHP_BINARY') ? PHP_BINARY : 'php';