Skip to content

Commit 22f933d

Browse files
Merge branch '12.3'
2 parents c750a44 + 0d385ce commit 22f933d

8 files changed

+4
-8
lines changed

tests/end-to-end/regression/2724-diff-pid-from-parent-process.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ GH-2724: Missing initialization of setRunClassInSeparateProcess() for tests with
44
<?php declare(strict_types=1);
55
$_SERVER['argv'][] = '--do-not-cache-result';
66
$_SERVER['argv'][] = '--no-configuration';
7+
$_SERVER['argv'][] = '--process-isolation';
78
$_SERVER['argv'][] = __DIR__ . '/2724/SeparateClassRunMethodInNewProcessTest.php';
89

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

tests/end-to-end/regression/2724/SeparateClassRunMethodInNewProcessTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@
1414
use function file_get_contents;
1515
use function getmypid;
1616
use function unlink;
17-
use PHPUnit\Framework\Attributes\RunClassInSeparateProcess;
1817
use PHPUnit\Framework\TestCase;
1918

20-
#[RunClassInSeparateProcess]
2119
final class SeparateClassRunMethodInNewProcessTest extends TestCase
2220
{
2321
public const string PROCESS_ID_FILE_PATH = __DIR__ . '/parent_process_id.txt';

tests/end-to-end/regression/2725-separate-class-before-after-pid.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ GH-2725: Verify that @runClassInSeparateProcess runs @beforeclass and @afterclas
44
<?php declare(strict_types=1);
55
$_SERVER['argv'][] = '--do-not-cache-result';
66
$_SERVER['argv'][] = '--no-configuration';
7+
$_SERVER['argv'][] = '--process-isolation';
78
$_SERVER['argv'][] = __DIR__ . '/2725/BeforeAfterClassPidTest.php';
89

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

tests/end-to-end/regression/2725/BeforeAfterClassPidTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
use function getmypid;
1313
use PHPUnit\Framework\Attributes\AfterClass;
1414
use PHPUnit\Framework\Attributes\BeforeClass;
15-
use PHPUnit\Framework\Attributes\RunClassInSeparateProcess;
1615
use PHPUnit\Framework\TestCase;
1716

18-
#[RunClassInSeparateProcess]
1917
class BeforeAfterClassPidTest extends TestCase
2018
{
2119
public const PID_VARIABLE = 'current_pid';

tests/end-to-end/regression/4391-separate-class-requires-in-class.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ disable_functions=proc_open
66
<?php declare(strict_types=1);
77
$_SERVER['argv'][] = '--do-not-cache-result';
88
$_SERVER['argv'][] = '--no-configuration';
9+
$_SERVER['argv'][] = '--process-isolation';
910
$_SERVER['argv'][] = __DIR__ . '/4391/RunClassInSeparateProcessClassTest.php';
1011

1112
require_once __DIR__ . '/../../bootstrap.php';

tests/end-to-end/regression/4391-separate-class-requires-in-method.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ disable_functions=proc_open
66
<?php declare(strict_types=1);
77
$_SERVER['argv'][] = '--do-not-cache-result';
88
$_SERVER['argv'][] = '--no-configuration';
9+
$_SERVER['argv'][] = '--process-isolation';
910
$_SERVER['argv'][] = __DIR__ . '/4391/RunClassInSeparateProcessMethodTest.php';
1011

1112
require_once __DIR__ . '/../../bootstrap.php';

tests/end-to-end/regression/4391/RunClassInSeparateProcessClassTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111

1212
use Exception;
1313
use PHPUnit\Framework\Attributes\RequiresPhpunit;
14-
use PHPUnit\Framework\Attributes\RunClassInSeparateProcess;
1514
use PHPUnit\Framework\TestCase;
1615

17-
#[RunClassInSeparateProcess]
1816
#[RequiresPhpunit('< 10')]
1917
final class RunClassInSeparateProcessClassTest extends TestCase
2018
{

tests/end-to-end/regression/4391/RunClassInSeparateProcessMethodTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111

1212
use Exception;
1313
use PHPUnit\Framework\Attributes\RequiresPhpunit;
14-
use PHPUnit\Framework\Attributes\RunClassInSeparateProcess;
1514
use PHPUnit\Framework\TestCase;
1615

17-
#[RunClassInSeparateProcess]
1816
final class RunClassInSeparateProcessMethodTest extends TestCase
1917
{
2018
#[RequiresPhpunit('< 10')]

0 commit comments

Comments
 (0)