Merge branch '2.3' into 2.7

* 2.3:
  Use PHPUnit 5.0 for PHP 7
This commit is contained in:
Fabien Potencier 2015-10-01 10:36:54 +02:00
commit 4b24394a87

View File

@ -3,9 +3,14 @@
error_reporting(-1);
$PHPUNIT_VERSION = 4.8;
$PHPUNIT_VERSION = '4.8';
$PHPUNIT_DIR = __DIR__.'/.phpunit';
// PHPUnit 4.8 does not support PHP 7, while 5.0 requires PHP 5.6+
if (PHP_VERSION_ID >= 70000) {
$PHPUNIT_DIR = '5.0';
}
if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit")) {
// Build a standalone phpunit without symfony/yaml