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

+3-1
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

+2-2
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

+2-2
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

+2-2
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

+2-2
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

+2-2
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

+2-2
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

+2-2
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

‎tests/end-to-end/logging/log-teamcity-comparisonfailure.phpt renamed to ‎tests/end-to-end/logging/teamcity/log-teamcity-comparisonfailure.phpt

+2-2
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-teamcity';
99
$_SERVER['argv'][] = 'php://stdout';
10-
$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/ComparisonFailureTest.php');
10+
$_SERVER['argv'][] = \realpath(__DIR__ . '/../../../_files/ComparisonFailureTest.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-teamcity-invalid-path.phpt renamed to ‎tests/end-to-end/logging/teamcity/log-teamcity-invalid-path.phpt

+2-2
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-teamcity';
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-teamcity-invalid-socket.phpt renamed to ‎tests/end-to-end/logging/teamcity/log-teamcity-invalid-socket.phpt

+2-2
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-teamcity';
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-teamcity.phpt renamed to ‎tests/end-to-end/logging/teamcity/log-teamcity.phpt

+2-2
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-teamcity';
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/teamcity-data-provider.phpt renamed to ‎tests/end-to-end/logging/teamcity/teamcity-data-provider.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ phpunit --teamcity _files/DataProviderTest.php
55
$_SERVER['argv'][] = '--do-not-cache-result';
66
$_SERVER['argv'][] = '--no-configuration';
77
$_SERVER['argv'][] = '--teamcity';
8-
$_SERVER['argv'][] = __DIR__ . '/_files/DataProviderTest.php';
8+
$_SERVER['argv'][] = __DIR__ . '/../_files/DataProviderTest.php';
99

10-
require_once __DIR__ . '/../../bootstrap.php';
10+
require_once __DIR__ . '/../../../bootstrap.php';
1111

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

‎tests/end-to-end/logging/teamcity-directory.phpt renamed to ‎tests/end-to-end/logging/teamcity/teamcity-directory.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ phpunit --teamcity ../../basic/unit/
55
$_SERVER['argv'][] = '--do-not-cache-result';
66
$_SERVER['argv'][] = '--no-configuration';
77
$_SERVER['argv'][] = '--teamcity';
8-
$_SERVER['argv'][] = __DIR__ . '/../_files/basic/unit/';
8+
$_SERVER['argv'][] = __DIR__ . '/../../_files/basic/unit/';
99

10-
require_once __DIR__ . '/../../bootstrap.php';
10+
require_once __DIR__ . '/../../../bootstrap.php';
1111

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

‎tests/end-to-end/logging/teamcity-file.phpt renamed to ‎tests/end-to-end/logging/teamcity/teamcity-file.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ phpunit --teamcity ../../basic/unit/StatusTest.php
55
$_SERVER['argv'][] = '--do-not-cache-result';
66
$_SERVER['argv'][] = '--no-configuration';
77
$_SERVER['argv'][] = '--teamcity';
8-
$_SERVER['argv'][] = __DIR__ . '/../_files/basic/unit/StatusTest.php';
8+
$_SERVER['argv'][] = __DIR__ . '/../../_files/basic/unit/StatusTest.php';
99

10-
require_once __DIR__ . '/../../bootstrap.php';
10+
require_once __DIR__ . '/../../../bootstrap.php';
1111

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

‎tests/end-to-end/logging/teamcity-inner-exceptions.phpt renamed to ‎tests/end-to-end/logging/teamcity/teamcity-inner-exceptions.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ $_SERVER['argv'][] = '--dont-report-useless-tests';
88
$_SERVER['argv'][] = '--no-output';
99
$_SERVER['argv'][] = '--log-teamcity';
1010
$_SERVER['argv'][] = 'php://stdout';
11-
$_SERVER['argv'][] = \realpath(__DIR__ . '/../../_files/ExceptionStackTest.php');
11+
$_SERVER['argv'][] = __DIR__ . '/../../../_files/ExceptionStackTest.php';
1212

13-
require_once __DIR__ . '/../../bootstrap.php';
13+
require_once __DIR__ . '/../../../bootstrap.php';
1414

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

‎tests/end-to-end/logging/teamcity-print-deprecation.phpt renamed to ‎tests/end-to-end/logging/teamcity/teamcity-print-deprecation.phpt

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22
TeamCity: print deprecation message
33
--FILE--
44
<?php declare(strict_types=1);
5-
6-
$parentDirectory = dirname(__DIR__);
7-
85
$_SERVER['argv'][] = '--display-deprecations';
96
$_SERVER['argv'][] = '--do-not-cache-result';
107
$_SERVER['argv'][] = '--no-configuration';
118
$_SERVER['argv'][] = '--no-output';
129
$_SERVER['argv'][] = '--log-teamcity';
1310
$_SERVER['argv'][] = 'php://stdout';
14-
$_SERVER['argv'][] = realpath($parentDirectory. '/_files/stop-on-fail-on/DeprecationTest.php');
11+
$_SERVER['argv'][] = __DIR__ . '/../../_files/stop-on-fail-on/DeprecationTest.php';
1512

16-
require realpath($parentDirectory . '/../bootstrap.php');
13+
require_once __DIR__ . '/../../../bootstrap.php';
1714

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

‎tests/end-to-end/logging/teamcity-print-error.phpt renamed to ‎tests/end-to-end/logging/teamcity/teamcity-print-error.phpt

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22
TeamCity: print error message
33
--FILE--
44
<?php declare(strict_types=1);
5-
6-
$parentDirectory = dirname(__DIR__);
7-
85
$_SERVER['argv'][] = '--display-errors';
96
$_SERVER['argv'][] = '--do-not-cache-result';
107
$_SERVER['argv'][] = '--no-configuration';
118
$_SERVER['argv'][] = '--no-output';
129
$_SERVER['argv'][] = '--log-teamcity';
1310
$_SERVER['argv'][] = 'php://stdout';
14-
$_SERVER['argv'][] = realpath($parentDirectory. '/_files/stop-on-fail-on/ErrorTest.php');
11+
$_SERVER['argv'][] = __DIR__ . '/../../_files/stop-on-fail-on/ErrorTest.php';
1512

16-
require realpath($parentDirectory . '/../bootstrap.php');
13+
require_once __DIR__ . '/../../../bootstrap.php';
1714

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

‎tests/end-to-end/logging/teamcity-print-failure.phpt renamed to ‎tests/end-to-end/logging/teamcity/teamcity-print-failure.phpt

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@
22
TeamCity: print failure message
33
--FILE--
44
<?php declare(strict_types=1);
5-
6-
$parentDirectory = dirname(__DIR__);
7-
85
$_SERVER['argv'][] = '--do-not-cache-result';
96
$_SERVER['argv'][] = '--no-configuration';
107
$_SERVER['argv'][] = '--no-output';
118
$_SERVER['argv'][] = '--log-teamcity';
129
$_SERVER['argv'][] = 'php://stdout';
13-
$_SERVER['argv'][] = realpath($parentDirectory. '/_files/stop-on-fail-on/FailureTest.php');
10+
$_SERVER['argv'][] = __DIR__ . '/../../_files/stop-on-fail-on/FailureTest.php';
1411

15-
require realpath($parentDirectory . '/../bootstrap.php');
12+
require_once __DIR__ . '/../../../bootstrap.php';
1613

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

‎tests/end-to-end/logging/teamcity-print-incomplete.phpt renamed to ‎tests/end-to-end/logging/teamcity/teamcity-print-incomplete.phpt

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22
TeamCity: print incomplete message
33
--FILE--
44
<?php declare(strict_types=1);
5-
6-
$parentDirectory = dirname(__DIR__);
7-
85
$_SERVER['argv'][] = '--display-incomplete';
96
$_SERVER['argv'][] = '--do-not-cache-result';
107
$_SERVER['argv'][] = '--no-configuration';
118
$_SERVER['argv'][] = '--no-output';
129
$_SERVER['argv'][] = '--log-teamcity';
1310
$_SERVER['argv'][] = 'php://stdout';
14-
$_SERVER['argv'][] = realpath($parentDirectory. '/_files/stop-on-fail-on/IncompleteTest.php');
11+
$_SERVER['argv'][] = __DIR__ . '/../../_files/stop-on-fail-on/IncompleteTest.php';
1512

16-
require realpath($parentDirectory . '/../bootstrap.php');
13+
require_once __DIR__ . '/../../../bootstrap.php';
1714

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

‎tests/end-to-end/logging/teamcity-print-notice.phpt renamed to ‎tests/end-to-end/logging/teamcity/teamcity-print-notice.phpt

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22
TeamCity: print notice message
33
--FILE--
44
<?php declare(strict_types=1);
5-
6-
$parentDirectory = dirname(__DIR__);
7-
85
$_SERVER['argv'][] = '--display-notices';
96
$_SERVER['argv'][] = '--do-not-cache-result';
107
$_SERVER['argv'][] = '--no-configuration';
118
$_SERVER['argv'][] = '--no-output';
129
$_SERVER['argv'][] = '--log-teamcity';
1310
$_SERVER['argv'][] = 'php://stdout';
14-
$_SERVER['argv'][] = realpath($parentDirectory. '/_files/stop-on-fail-on/NoticeTest.php');
11+
$_SERVER['argv'][] = __DIR__ . '/../../_files/stop-on-fail-on/NoticeTest.php';
1512

16-
require realpath($parentDirectory . '/../bootstrap.php');
13+
require_once __DIR__ . '/../../../bootstrap.php';
1714

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

‎tests/end-to-end/logging/teamcity-print-risky.phpt renamed to ‎tests/end-to-end/logging/teamcity/teamcity-print-risky.phpt

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@
22
TeamCity: print risky message
33
--FILE--
44
<?php declare(strict_types=1);
5-
6-
$parentDirectory = dirname(__DIR__);
7-
85
$_SERVER['argv'][] = '--do-not-cache-result';
96
$_SERVER['argv'][] = '--no-configuration';
107
$_SERVER['argv'][] = '--no-output';
118
$_SERVER['argv'][] = '--log-teamcity';
129
$_SERVER['argv'][] = 'php://stdout';
13-
$_SERVER['argv'][] = realpath($parentDirectory. '/_files/stop-on-fail-on/RiskyTest.php');
10+
$_SERVER['argv'][] = __DIR__ . '/../../_files/stop-on-fail-on/RiskyTest.php';
1411

15-
require realpath($parentDirectory . '/../bootstrap.php');
12+
require_once __DIR__ . '/../../../bootstrap.php';
1613

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

‎tests/end-to-end/logging/teamcity-print-skipped-before-class.phpt renamed to ‎tests/end-to-end/logging/teamcity/teamcity-print-skipped-before-class.phpt

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
--TEST--
22
TeamCity: test skipped in before-class method
33
--FILE--
4-
<?php declare(strict_types=1);
5-
$parentDirectory = dirname(__DIR__);
6-
7-
$_SERVER['argv'][] = '--display-skipped';
4+
<?php declare(strict_types=1);$_SERVER['argv'][] = '--display-skipped';
85
$_SERVER['argv'][] = '--do-not-cache-result';
96
$_SERVER['argv'][] = '--no-configuration';
107
$_SERVER['argv'][] = '--no-output';
118
$_SERVER['argv'][] = '--log-teamcity';
129
$_SERVER['argv'][] = 'php://stdout';
13-
$_SERVER['argv'][] = realpath($parentDirectory. '/_files/stop-on-fail-on/SkippedBeforeClassTest.php');
10+
$_SERVER['argv'][] = __DIR__ . '/../../_files/stop-on-fail-on/SkippedBeforeClassTest.php';
1411

15-
require realpath($parentDirectory . '/../bootstrap.php');
12+
require_once __DIR__ . '/../../../bootstrap.php';
1613

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

‎tests/end-to-end/logging/teamcity-print-skipped.phpt renamed to ‎tests/end-to-end/logging/teamcity/teamcity-print-skipped.phpt

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
--TEST--
22
TeamCity: test skipped in test method
33
--FILE--
4-
<?php declare(strict_types=1);
5-
$parentDirectory = dirname(__DIR__);
6-
7-
$_SERVER['argv'][] = '--display-skipped';
4+
<?php declare(strict_types=1);$_SERVER['argv'][] = '--display-skipped';
85
$_SERVER['argv'][] = '--do-not-cache-result';
96
$_SERVER['argv'][] = '--no-configuration';
107
$_SERVER['argv'][] = '--no-output';
118
$_SERVER['argv'][] = '--log-teamcity';
129
$_SERVER['argv'][] = 'php://stdout';
13-
$_SERVER['argv'][] = realpath($parentDirectory. '/_files/stop-on-fail-on/SkippedTest.php');
10+
$_SERVER['argv'][] = __DIR__ . '/../../_files/stop-on-fail-on/SkippedTest.php';
1411

15-
require realpath($parentDirectory . '/../bootstrap.php');
12+
require_once __DIR__ . '/../../../bootstrap.php';
1613

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

‎tests/end-to-end/logging/teamcity-print-warning.phpt renamed to ‎tests/end-to-end/logging/teamcity/teamcity-print-warning.phpt

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22
TeamCity: print warning message
33
--FILE--
44
<?php declare(strict_types=1);
5-
6-
$parentDirectory = dirname(__DIR__);
7-
85
$_SERVER['argv'][] = '--display-warnings';
96
$_SERVER['argv'][] = '--do-not-cache-result';
107
$_SERVER['argv'][] = '--no-configuration';
118
$_SERVER['argv'][] = '--no-output';
129
$_SERVER['argv'][] = '--log-teamcity';
1310
$_SERVER['argv'][] = 'php://stdout';
14-
$_SERVER['argv'][] = realpath($parentDirectory. '/_files/stop-on-fail-on/WarningTest.php');
11+
$_SERVER['argv'][] = __DIR__ . '/../../_files/stop-on-fail-on/WarningTest.php';
1512

16-
require realpath($parentDirectory . '/../bootstrap.php');
13+
require_once __DIR__ . '/../../../bootstrap.php';
1714

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

‎tests/end-to-end/logging/teamcity-warning.phpt renamed to ‎tests/end-to-end/logging/teamcity/teamcity-warning.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ phpunit --teamcity ../../basic/unit/StatusTest.php
44
<?php declare(strict_types=1);
55
$_SERVER['argv'][] = '--do-not-cache-result';
66
$_SERVER['argv'][] = '--configuration';
7-
$_SERVER['argv'][] = __DIR__ . '/_files/teamcity-warning/phpunit.xml';
7+
$_SERVER['argv'][] = __DIR__ . '/../_files/teamcity-warning/phpunit.xml';
88
$_SERVER['argv'][] = '--teamcity';
99

10-
require_once __DIR__ . '/../../bootstrap.php';
10+
require_once __DIR__ . '/../../../bootstrap.php';
1111

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

0 commit comments

Comments
 (0)