From 5e2d43e32222fc4277e395f61ecfdd4f2d9345cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Wed, 4 Apr 2018 18:35:37 +0200 Subject: [PATCH] [PhpUnitBridge] Search for SYMFONY_PHPUNIT_REMOVE env var in phpunit.xml then phpunit.xml.dist --- src/Symfony/Bridge/PhpUnit/CHANGELOG.md | 6 ++++++ src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/Symfony/Bridge/PhpUnit/CHANGELOG.md b/src/Symfony/Bridge/PhpUnit/CHANGELOG.md index 3c21d4cc7c8c7..3eb488a121519 100644 --- a/src/Symfony/Bridge/PhpUnit/CHANGELOG.md +++ b/src/Symfony/Bridge/PhpUnit/CHANGELOG.md @@ -1,6 +1,12 @@ CHANGELOG ========= +4.1.0 +----- + + * Search for `SYMFONY_PHPUNIT_REMOVE` env var in `phpunit.xml` then + `phpunit.xml.dist` + 4.0.0 ----- diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit index a549cd7da4fb7..3998b5df45222 100755 --- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit +++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit @@ -53,6 +53,21 @@ $COMPOSER = file_exists($COMPOSER = $oldPwd.'/composer.phar') || ($COMPOSER = rt if (false === $SYMFONY_PHPUNIT_REMOVE = getenv('SYMFONY_PHPUNIT_REMOVE')) { $SYMFONY_PHPUNIT_REMOVE = 'phpspec/prophecy symfony/yaml'; + + $phpunitConfigFilename = null; + if (file_exists('phpunit.xml')) { + $phpunitConfigFilename = 'phpunit.xml'; + } elseif (file_exists('phpunit.xml.dist')) { + $phpunitConfigFilename = 'phpunit.xml.dist'; + } + if ($phpunitConfigFilename) { + $xml = new DomDocument(); + $xml->load($phpunitConfigFilename); + $var = (new DOMXpath($xml))->query('//php/env[@name="SYMFONY_PHPUNIT_REMOVE"]')[0]; + if ($var) { + $SYMFONY_PHPUNIT_REMOVE = $var->getAttribute('value'); + } + } } if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__FILE__)."\n".$SYMFONY_PHPUNIT_REMOVE !== @file_get_contents("$PHPUNIT_DIR/.$PHPUNIT_VERSION.md5")) {