Skip to content

Commit c60d4ba

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '10.5' into 11.5
2 parents e108ac8 + a02bd72 commit c60d4ba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+85
-134
lines changed

‎phpunit.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
<directory suffix=".phpt">tests/end-to-end/extension-xml</directory>
2424
<directory suffix=".phpt">tests/end-to-end/generic</directory>
2525
<directory suffix=".phpt">tests/end-to-end/groups-from-configuration</directory>
26-
<directory suffix=".phpt">tests/end-to-end/logging</directory>
26+
<directory suffix=".phpt">tests/end-to-end/logging/junit</directory>
27+
<directory suffix=".phpt">tests/end-to-end/logging/teamcity</directory>
28+
<directory suffix=".phpt">tests/end-to-end/logging/testdox</directory>
2729
<directory suffix=".phpt">tests/end-to-end/metadata</directory>
2830
<directory suffix=".phpt">tests/end-to-end/migration</directory>
2931
<directory suffix=".phpt">tests/end-to-end/mock-objects</directory>

‎tests/end-to-end/logging/failure-reverse-list.phpt renamed to ‎tests/end-to-end/cli/failure-reverse-list.phpt

File renamed without changes.

‎tests/end-to-end/logging/no-output.phpt renamed to ‎tests/end-to-end/cli/no-output.phpt

File renamed without changes.

‎tests/end-to-end/logging/log-junit-invalid-path.phpt renamed to ‎tests/end-to-end/logging/junit/invalid-path.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ $_SERVER['argv'][] = '--do-not-cache-result';
66
$_SERVER['argv'][] = '--no-configuration';
77
$_SERVER['argv'][] = '--log-junit';
88
$_SERVER['argv'][] = '';
9-
$_SERVER['argv'][] = __DIR__ . '/../_files/basic/SuccessTest.php';
9+
$_SERVER['argv'][] = __DIR__ . '/../../_files/basic/SuccessTest.php';
1010

11-
require_once __DIR__ . '/../../bootstrap.php';
11+
require_once __DIR__ . '/../../../bootstrap.php';
1212

1313
(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
1414
--EXPECTF--

‎tests/end-to-end/logging/log-junit-invalid-socket.phpt renamed to ‎tests/end-to-end/logging/junit/invalid-socket.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ $_SERVER['argv'][] = '--do-not-cache-result';
66
$_SERVER['argv'][] = '--no-configuration';
77
$_SERVER['argv'][] = '--log-junit';
88
$_SERVER['argv'][] = 'socket://hostname:port:wrong';
9-
$_SERVER['argv'][] = __DIR__ . '/../_files/basic/SuccessTest.php';
9+
$_SERVER['argv'][] = __DIR__ . '/../../_files/basic/SuccessTest.php';
1010

11-
require_once __DIR__ . '/../../bootstrap.php';
11+
require_once __DIR__ . '/../../../bootstrap.php';
1212

1313
(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
1414
--EXPECTF--

‎tests/end-to-end/logging/log-junit-skipped-before-class-method.phpt renamed to ‎tests/end-to-end/logging/junit/skipped-before-class-method.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ $_SERVER['argv'][] = '--no-configuration';
77
$_SERVER['argv'][] = '--no-output';
88
$_SERVER['argv'][] = '--log-junit';
99
$_SERVER['argv'][] = 'php://stdout';
10-
$_SERVER['argv'][] = __DIR__ . '/../_files/stop-on-fail-on/SkippedBeforeClassTest.php';
10+
$_SERVER['argv'][] = __DIR__ . '/../../_files/stop-on-fail-on/SkippedBeforeClassTest.php';
1111

12-
require_once __DIR__ . '/../../bootstrap.php';
12+
require_once __DIR__ . '/../../../bootstrap.php';
1313

1414
(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
1515
--EXPECTF--

‎tests/end-to-end/logging/log-junit-skipped-test-method.phpt renamed to ‎tests/end-to-end/logging/junit/skipped-test-method.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ $_SERVER['argv'][] = '--no-configuration';
77
$_SERVER['argv'][] = '--no-output';
88
$_SERVER['argv'][] = '--log-junit';
99
$_SERVER['argv'][] = 'php://stdout';
10-
$_SERVER['argv'][] = __DIR__ . '/../_files/stop-on-fail-on/SkippedTest.php';
10+
$_SERVER['argv'][] = __DIR__ . '/../../_files/stop-on-fail-on/SkippedTest.php';
1111

12-
require_once __DIR__ . '/../../bootstrap.php';
12+
require_once __DIR__ . '/../../../bootstrap.php';
1313

1414
(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
1515
--EXPECTF--

‎tests/end-to-end/logging/log-junit-to-file.phpt renamed to ‎tests/end-to-end/logging/junit/to-file.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ $_SERVER['argv'][] = '--no-configuration';
99
$_SERVER['argv'][] = '--no-output';
1010
$_SERVER['argv'][] = '--log-junit';
1111
$_SERVER['argv'][] = $logfile;
12-
$_SERVER['argv'][] = __DIR__ . '/../_files/basic/unit/StatusTest.php';
12+
$_SERVER['argv'][] = __DIR__ . '/../../_files/basic/unit/StatusTest.php';
1313

14-
require_once __DIR__ . '/../../bootstrap.php';
14+
require_once __DIR__ . '/../../../bootstrap.php';
1515

1616
(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
1717

‎tests/end-to-end/logging/log-junit-to-stdout.phpt renamed to ‎tests/end-to-end/logging/junit/to-stdout.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ $_SERVER['argv'][] = '--no-configuration';
77
$_SERVER['argv'][] = '--no-output';
88
$_SERVER['argv'][] = '--log-junit';
99
$_SERVER['argv'][] = 'php://stdout';
10-
$_SERVER['argv'][] = __DIR__ . '/../_files/basic/unit/StatusTest.php';
10+
$_SERVER['argv'][] = __DIR__ . '/../../_files/basic/unit/StatusTest.php';
1111

12-
require_once __DIR__ . '/../../bootstrap.php';
12+
require_once __DIR__ . '/../../../bootstrap.php';
1313

1414
(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
1515
--EXPECTF--

‎tests/end-to-end/logging/log-junit-with-progress-with-errors.phpt renamed to ‎tests/end-to-end/logging/junit/with-progress-with-errors.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ $_SERVER['argv'][] = '--no-configuration';
1414
$_SERVER['argv'][] = '--dont-report-useless-tests';
1515
$_SERVER['argv'][] = '--log-junit';
1616
$_SERVER['argv'][] = $logfile;
17-
$_SERVER['argv'][] = __DIR__ . '/_files/TypeErrorTest.php';
17+
$_SERVER['argv'][] = __DIR__ . '/../_files/TypeErrorTest.php';
1818

19-
require_once __DIR__ . '/../../bootstrap.php';
19+
require_once __DIR__ . '/../../../bootstrap.php';
2020

2121
(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
2222

0 commit comments

Comments
 (0)