Add SYMFONY_PHPUNIT_REQUIRE env variable

acasademont · acasademont · commit aa901532bb7c · 2021-02-01T16:51:32.000+01:00
Fixes #39387
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
@@ -166,8 +166,9 @@
         $prevCacheDir = false;
     }
 }
+$SYMFONY_PHPUNIT_REQUIRE = $getEnvVar('SYMFONY_PHPUNIT_REQUIRE', '');
 $SYMFONY_PHPUNIT_REMOVE = $getEnvVar('SYMFONY_PHPUNIT_REMOVE', 'phpspec/prophecy'.($PHPUNIT_VERSION < 6.0 ? ' symfony/yaml' : ''));
-$configurationHash = md5(implode(\PHP_EOL, [md5_file(__FILE__), $SYMFONY_PHPUNIT_REMOVE, (int) $PHPUNIT_REMOVE_RETURN_TYPEHINT]));
+$configurationHash = md5(implode(\PHP_EOL, [md5_file(__FILE__), $SYMFONY_PHPUNIT_REQUIRE, $SYMFONY_PHPUNIT_REMOVE, (int) $PHPUNIT_REMOVE_RETURN_TYPEHINT]));
 $PHPUNIT_VERSION_DIR = sprintf('phpunit-%s-%d', $PHPUNIT_VERSION, $PHPUNIT_REMOVE_RETURN_TYPEHINT);
 if (!file_exists("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit") || $configurationHash !== @file_get_contents("$PHPUNIT_DIR/.$PHPUNIT_VERSION_DIR.md5")) {
     // Build a standalone phpunit without symfony/yaml nor prophecy by default
@@ -221,6 +222,9 @@
 
     @copy("$PHPUNIT_VERSION_DIR/phpunit.xsd", 'phpunit.xsd');
     chdir("$PHPUNIT_VERSION_DIR");
+    if ($SYMFONY_PHPUNIT_REQUIRE) {
+        $passthruOrFail("$COMPOSER require --no-update ".$SYMFONY_PHPUNIT_REQUIRE);
+    }
     if ($SYMFONY_PHPUNIT_REMOVE) {
         $passthruOrFail("$COMPOSER remove --no-update ".$SYMFONY_PHPUNIT_REMOVE);
     }

Original file line number	Diff line number	Diff line change
`@@ -166,8 +166,9 @@`
`166`	`166`	`$prevCacheDir = false;`
`167`	`167`	`}`
`168`	`168`	`}`
	`169`	`+$SYMFONY_PHPUNIT_REQUIRE = $getEnvVar('SYMFONY_PHPUNIT_REQUIRE', '');`
`169`	`170`	`$SYMFONY_PHPUNIT_REMOVE = $getEnvVar('SYMFONY_PHPUNIT_REMOVE', 'phpspec/prophecy'.($PHPUNIT_VERSION < 6.0 ? ' symfony/yaml' : ''));`
`170`		`-$configurationHash = md5(implode(\PHP_EOL, [md5_file(__FILE__), $SYMFONY_PHPUNIT_REMOVE, (int) $PHPUNIT_REMOVE_RETURN_TYPEHINT]));`
	`171`	`+$configurationHash = md5(implode(\PHP_EOL, [md5_file(__FILE__), $SYMFONY_PHPUNIT_REQUIRE, $SYMFONY_PHPUNIT_REMOVE, (int) $PHPUNIT_REMOVE_RETURN_TYPEHINT]));`
`171`	`172`	`$PHPUNIT_VERSION_DIR = sprintf('phpunit-%s-%d', $PHPUNIT_VERSION, $PHPUNIT_REMOVE_RETURN_TYPEHINT);`
`172`	`173`	`if (!file_exists("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit") \|\| $configurationHash !== @file_get_contents("$PHPUNIT_DIR/.$PHPUNIT_VERSION_DIR.md5")) {`
`173`	`174`	`// Build a standalone phpunit without symfony/yaml nor prophecy by default`
`@@ -221,6 +222,9 @@`
`221`	`222`
`222`	`223`	`@copy("$PHPUNIT_VERSION_DIR/phpunit.xsd", 'phpunit.xsd');`
`223`	`224`	`chdir("$PHPUNIT_VERSION_DIR");`
	`225`	`+ if ($SYMFONY_PHPUNIT_REQUIRE) {`
	`226`	`+ $passthruOrFail("$COMPOSER require --no-update ".$SYMFONY_PHPUNIT_REQUIRE);`
	`227`	`+ }`
`224`	`228`	`if ($SYMFONY_PHPUNIT_REMOVE) {`
`225`	`229`	`$passthruOrFail("$COMPOSER remove --no-update ".$SYMFONY_PHPUNIT_REMOVE);`
`226`	`230`	`}`