Skip to content

Commit 96155ac

Browse files
author
Robin Chalas
committed
Merge branch '4.2'
* 4.2: Fix url matcher edge cases with trailing slash [Form] Fix author tag + exception messages [TwigBridge] Fix deprecation on twig 2.9 Fix left-associative ternary deprecation warnings for PHP 7.4 [Validator] Fixed imprecise translations [Validator] Add Dutch translations [Security] Cleanup "Digest nonce has expired." translation Intercept redirections only for HTML format [PhpUnitBridge] fix reading phpunit.xml on bootstrap resolve class name parameters Fix name and phpdoc of ContainerBuilder::removeBindings [Intl] Update the ICU data to 64.2
2 parents 32c5fa5 + 31f2e3c commit 96155ac

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

bin/simple-phpunit

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ $getEnvVar = function ($name, $default = false) {
3737
}
3838
if (false !== $phpunitConfig) {
3939
$var = new DOMXpath($phpunitConfig);
40+
foreach ($var->query('//php/server[@name="'.$name.'"]') as $var) {
41+
return $var->getAttribute('value');
42+
}
4043
foreach ($var->query('//php/env[@name="'.$name.'"]') as $var) {
4144
return $var->getAttribute('value');
4245
}
@@ -94,7 +97,7 @@ $COMPOSER = file_exists($COMPOSER = $oldPwd.'/composer.phar') || ($COMPOSER = rt
9497
: 'composer';
9598

9699

97-
$SYMFONY_PHPUNIT_REMOVE = $getEnvVar('SYMFONY_PHPUNIT_REMOVE', 'phpspec/prophecy symfony/yaml');
100+
$SYMFONY_PHPUNIT_REMOVE = $getEnvVar('SYMFONY_PHPUNIT_REMOVE', 'phpspec/prophecy'.($PHPUNIT_VERSION < 6.0 ? ' symfony/yaml': ''));
98101

99102
if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__FILE__)."\n".$SYMFONY_PHPUNIT_REMOVE !== @file_get_contents("$PHPUNIT_DIR/.$PHPUNIT_VERSION.md5")) {
100103
// Build a standalone phpunit without symfony/yaml nor prophecy by default

0 commit comments

Comments
 (0)