Skip to content

Commit c969469

Browse files
Merge branch '4.3' into 4.4
* 4.3: cleanups Disable PHPUnit result cache on the CI [Security] Cleanup "Digest nonce has expired." translation [Translation] Highlight invalid translation status Added translations in validator for Serbian Cyrillic Added translations in validator for Serbian Latin [EventDispatcher] wrong Request class [DependencyInjection] improved exception message
2 parents 8efc86f + 708cf16 commit c969469

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

bin/simple-phpunit.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,14 @@ class SymfonyBlacklistPhpunit {}
185185
global $argv, $argc;
186186
$argv = isset($_SERVER['argv']) ? $_SERVER['argv'] : array();
187187
$argc = isset($_SERVER['argc']) ? $_SERVER['argc'] : 0;
188+
189+
if ($PHPUNIT_VERSION < 8.0) {
190+
$argv = array_filter($argv, function ($v) use (&$argc) { if ('--do-not-cache-result' !== $v) return true; --$argc; });
191+
} elseif (filter_var(getenv('SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE'), FILTER_VALIDATE_BOOLEAN)) {
192+
$argv[] = '--do-not-cache-result';
193+
++$argc;
194+
}
195+
188196
$components = array();
189197
$cmd = array_map('escapeshellarg', $argv);
190198
$exit = 0;

0 commit comments

Comments
 (0)