Skip to content

Commit 0306130

Browse files
Consistently use --do-not-cache-result CLI option
1 parent 0cee9c6 commit 0306130

File tree

6 files changed

+24
-18
lines changed

6 files changed

+24
-18
lines changed

tests/end-to-end/cli/deprecation-warning-with-class.phpt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
phpunit DummyFooTest ../../_files/DummyFooTest.php
33
--FILE--
44
<?php declare(strict_types=1);
5-
$_SERVER['argv'][1] = '--no-configuration';
6-
$_SERVER['argv'][2] = 'DummyFooTest';
7-
$_SERVER['argv'][3] = __DIR__ . '/../../_files/DummyFooTest.php';
5+
$_SERVER['argv'][] = '--no-configuration';
6+
$_SERVER['argv'][] = '--do-not-cache-result';
7+
$_SERVER['argv'][] = 'DummyFooTest';
8+
$_SERVER['argv'][] = __DIR__ . '/../../_files/DummyFooTest.php';
89

910
require_once __DIR__ . '/../../bootstrap.php';
1011
PHPUnit\TextUI\Command::main();

tests/end-to-end/regression/2085-enforce-time-limit-options-via-config-without-invoker.phpt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ if (!\extension_loaded('pcntl') || \strpos(\ini_get('disable_functions'), 'pcntl
1515
https://github.com/sebastianbergmann/phpunit/issues/2085
1616
--FILE--
1717
<?php declare(strict_types=1);
18-
$_SERVER['argv'][1] = '-c';
19-
$_SERVER['argv'][2] = __DIR__ . '/2085/configuration_enforce_time_limit_options.xml';
20-
$_SERVER['argv'][3] = __DIR__ . '/2085/Issue2085Test.php';
18+
$_SERVER['argv'][] = '--do-not-cache-result';
19+
$_SERVER['argv'][] = '--configuration';
20+
$_SERVER['argv'][] = __DIR__ . '/2085/configuration_enforce_time_limit_options.xml';
21+
$_SERVER['argv'][] = __DIR__ . '/2085/Issue2085Test.php';
2122

2223
require_once __DIR__ . '/../../bootstrap.php';
2324
PHPUnit\TextUI\Command::main();

tests/end-to-end/regression/2085-without-invoker.phpt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ if (!\extension_loaded('pcntl') || \strpos(\ini_get('disable_functions'), 'pcntl
1515
}
1616
--FILE--
1717
<?php declare(strict_types=1);
18-
$_SERVER['argv'][1] = '--no-configuration';
19-
$_SERVER['argv'][2] = '--enforce-time-limit';
20-
$_SERVER['argv'][3] = '--default-time-limit=10';
21-
$_SERVER['argv'][4] = __DIR__ . '/2085/Issue2085Test.php';
18+
$_SERVER['argv'][] = '--no-configuration';
19+
$_SERVER['argv'][] = '--do-not-cache-result';
20+
$_SERVER['argv'][] = '--enforce-time-limit';
21+
$_SERVER['argv'][] = '--default-time-limit=10';
22+
$_SERVER['argv'][] = __DIR__ . '/2085/Issue2085Test.php';
2223

2324
require_once __DIR__ . '/../../bootstrap.php';
2425
PHPUnit\TextUI\Command::main();

tests/end-to-end/regression/3904.phpt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
https://github.com/sebastianbergmann/phpunit/issues/3904
33
--FILE--
44
<?php declare(strict_types=1);
5-
$_SERVER['argv'][1] = '--no-configuration';
6-
$_SERVER['argv'][3] = 'Issue3904Test';
7-
$_SERVER['argv'][4] = __DIR__ . '/3904/Issue3904Test.php';
5+
$_SERVER['argv'][] = '--no-configuration';
6+
$_SERVER['argv'][] = '--do-not-cache-result';
7+
$_SERVER['argv'][] = 'Issue3904Test';
8+
$_SERVER['argv'][] = __DIR__ . '/3904/Issue3904Test.php';
89

910
require_once __DIR__ . '/../../bootstrap.php';
1011

tests/end-to-end/regression/3904_2.phpt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
https://github.com/sebastianbergmann/phpunit/issues/3904
33
--FILE--
44
<?php declare(strict_types=1);
5-
$_SERVER['argv'][1] = '--no-configuration';
6-
$_SERVER['argv'][3] = 'Issue3904';
7-
$_SERVER['argv'][4] = __DIR__ . '/3904/Issue3904_2Test.php';
5+
$_SERVER['argv'][] = '--no-configuration';
6+
$_SERVER['argv'][] = '--do-not-cache-result';
7+
$_SERVER['argv'][] = 'Issue3904';
8+
$_SERVER['argv'][] = __DIR__ . '/3904/Issue3904_2Test.php';
89

910
require_once __DIR__ . '/../../bootstrap.php';
1011

tests/end-to-end/regression/3904_3.phpt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
https://github.com/sebastianbergmann/phpunit/issues/3904
33
--FILE--
44
<?php declare(strict_types=1);
5-
$_SERVER['argv'][1] = '--no-configuration';
6-
$_SERVER['argv'][4] = __DIR__ . '/3904/Issue3904_3Test.php';
5+
$_SERVER['argv'][] = '--no-configuration';
6+
$_SERVER['argv'][] = '--do-not-cache-result';
7+
$_SERVER['argv'][] = __DIR__ . '/3904/Issue3904_3Test.php';
78

89
require_once __DIR__ . '/../../bootstrap.php';
910

0 commit comments

Comments
 (0)