Skip to content

Commit 5649a1f

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '11.5' into 12.0
2 parents 39d2726 + 2be2876 commit 5649a1f

File tree

12 files changed

+35
-35
lines changed

12 files changed

+35
-35
lines changed

‎src/Event/Dispatcher/DirectDispatcher.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function handleThrowable(Throwable $t): void
118118
{
119119
if (!defined('PHPUNIT_TESTSUITE') &&
120120
$this->isThrowableFromThirdPartySubscriber($t)) {
121-
Facade::emitter()->testRunnerTriggeredWarning(
121+
Facade::emitter()->testRunnerTriggeredPhpunitWarning(
122122
sprintf(
123123
'Exception in third-party event subscriber: %s%s%s',
124124
$t->getMessage(),

‎src/Event/Emitter/DispatchingEmitter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@ public function testSuiteFinished(TestSuite $testSuite): void
11281128
* @throws InvalidArgumentException
11291129
* @throws UnknownEventTypeException
11301130
*/
1131-
public function testRunnerTriggeredDeprecation(string $message): void
1131+
public function testRunnerTriggeredPhpunitDeprecation(string $message): void
11321132
{
11331133
$this->dispatcher->dispatch(
11341134
new TestRunner\DeprecationTriggered(
@@ -1142,7 +1142,7 @@ public function testRunnerTriggeredDeprecation(string $message): void
11421142
* @throws InvalidArgumentException
11431143
* @throws UnknownEventTypeException
11441144
*/
1145-
public function testRunnerTriggeredWarning(string $message): void
1145+
public function testRunnerTriggeredPhpunitWarning(string $message): void
11461146
{
11471147
$this->dispatcher->dispatch(
11481148
new TestRunner\WarningTriggered(

‎src/Event/Emitter/Emitter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,9 +280,9 @@ public function testRunnerStartedChildProcess(): void;
280280

281281
public function testRunnerFinishedChildProcess(string $stdout, string $stderr): void;
282282

283-
public function testRunnerTriggeredDeprecation(string $message): void;
283+
public function testRunnerTriggeredPhpunitDeprecation(string $message): void;
284284

285-
public function testRunnerTriggeredWarning(string $message): void;
285+
public function testRunnerTriggeredPhpunitWarning(string $message): void;
286286

287287
public function testRunnerEnabledGarbageCollection(): void;
288288

‎src/Framework/TestSuite.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public static function fromClassReflector(ReflectionClass $class, array $groups
110110
}
111111

112112
if ($testSuite->isEmpty()) {
113-
Event\Facade::emitter()->testRunnerTriggeredWarning(
113+
Event\Facade::emitter()->testRunnerTriggeredPhpunitWarning(
114114
sprintf(
115115
'No tests found in class "%s".',
116116
$class->getName(),
@@ -233,7 +233,7 @@ public function addTestFile(string $filename, array $groups = []): void
233233
);
234234
}
235235
} catch (RunnerException $e) {
236-
Event\Facade::emitter()->testRunnerTriggeredWarning(
236+
Event\Facade::emitter()->testRunnerTriggeredPhpunitWarning(
237237
$e->getMessage(),
238238
);
239239
}

‎src/Metadata/Parser/AttributeParser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ private function isSizeGroup(string $groupName, string $testClassName, ?string $
855855
return false;
856856
}
857857

858-
EventFacade::emitter()->testRunnerTriggeredWarning(
858+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
859859
sprintf(
860860
'Group name "%s" is not allowed for %s %s%s%s',
861861
$_groupName,

‎src/Runner/CodeCoverage.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ public function init(Configuration $configuration, CodeCoverageFilterRegistry $c
108108

109109
if ($codeCoverageFilterRegistry->get()->isEmpty()) {
110110
if (!$codeCoverageFilterRegistry->configured()) {
111-
EventFacade::emitter()->testRunnerTriggeredWarning(
111+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
112112
'No filter is configured, code coverage will not be processed',
113113
);
114114
} else {
115-
EventFacade::emitter()->testRunnerTriggeredWarning(
115+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
116116
'Incorrect filter configuration, code coverage will not be processed',
117117
);
118118
}
@@ -377,7 +377,7 @@ private function activate(Filter $filter, bool $pathCoverage): void
377377
$filter,
378378
);
379379
} catch (CodeCoverageException $e) {
380-
EventFacade::emitter()->testRunnerTriggeredWarning(
380+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
381381
$e->getMessage(),
382382
);
383383
}

‎src/Runner/Extension/ExtensionBootstrapper.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function __construct(Configuration $configuration, Facade $facade)
4343
public function bootstrap(string $className, array $parameters): void
4444
{
4545
if (!class_exists($className)) {
46-
EventFacade::emitter()->testRunnerTriggeredWarning(
46+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
4747
sprintf(
4848
'Cannot bootstrap extension because class %s does not exist',
4949
$className,
@@ -54,7 +54,7 @@ public function bootstrap(string $className, array $parameters): void
5454
}
5555

5656
if (!in_array(Extension::class, class_implements($className), true)) {
57-
EventFacade::emitter()->testRunnerTriggeredWarning(
57+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
5858
sprintf(
5959
'Cannot bootstrap extension because class %s does not implement interface %s',
6060
$className,
@@ -76,7 +76,7 @@ public function bootstrap(string $className, array $parameters): void
7676
ParameterCollection::fromArray($parameters),
7777
);
7878
} catch (Throwable $t) {
79-
EventFacade::emitter()->testRunnerTriggeredWarning(
79+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
8080
sprintf(
8181
'Bootstrapping of extension %s failed: %s%s%s',
8282
$className,

‎src/Runner/Extension/PharLoader.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function loadPharExtensionsInDirectory(string $directory): array
4444

4545
foreach ((new FileIteratorFacade)->getFilesAsArray($directory, '.phar') as $file) {
4646
if (!$pharExtensionLoaded) {
47-
Event\Facade::emitter()->testRunnerTriggeredWarning(
47+
Event\Facade::emitter()->testRunnerTriggeredPhpunitWarning(
4848
sprintf(
4949
'Cannot load extension from %s because the PHAR extension is not available',
5050
$file,
@@ -55,7 +55,7 @@ public function loadPharExtensionsInDirectory(string $directory): array
5555
}
5656

5757
if (!is_file('phar://' . $file . '/manifest.xml')) {
58-
Event\Facade::emitter()->testRunnerTriggeredWarning(
58+
Event\Facade::emitter()->testRunnerTriggeredPhpunitWarning(
5959
sprintf(
6060
'%s is not an extension for PHPUnit',
6161
$file,
@@ -71,7 +71,7 @@ public function loadPharExtensionsInDirectory(string $directory): array
7171
$manifest = ManifestLoader::fromFile('phar://' . $file . '/manifest.xml');
7272

7373
if (!$manifest->isExtensionFor($applicationName)) {
74-
Event\Facade::emitter()->testRunnerTriggeredWarning(
74+
Event\Facade::emitter()->testRunnerTriggeredPhpunitWarning(
7575
sprintf(
7676
'%s is not an extension for PHPUnit',
7777
$file,
@@ -82,7 +82,7 @@ public function loadPharExtensionsInDirectory(string $directory): array
8282
}
8383

8484
if (!$manifest->isExtensionFor($applicationName, $version)) {
85-
Event\Facade::emitter()->testRunnerTriggeredWarning(
85+
Event\Facade::emitter()->testRunnerTriggeredPhpunitWarning(
8686
sprintf(
8787
'%s is not compatible with PHPUnit %s',
8888
$file,
@@ -93,7 +93,7 @@ public function loadPharExtensionsInDirectory(string $directory): array
9393
continue;
9494
}
9595
} catch (ManifestException $e) {
96-
Event\Facade::emitter()->testRunnerTriggeredWarning(
96+
Event\Facade::emitter()->testRunnerTriggeredPhpunitWarning(
9797
sprintf(
9898
'Cannot load extension from %s: %s',
9999
$file,
@@ -107,7 +107,7 @@ public function loadPharExtensionsInDirectory(string $directory): array
107107
try {
108108
@require $file;
109109
} catch (Throwable $t) {
110-
Event\Facade::emitter()->testRunnerTriggeredWarning(
110+
Event\Facade::emitter()->testRunnerTriggeredPhpunitWarning(
111111
sprintf(
112112
'Cannot load extension from %s: %s',
113113
$file,

‎src/TextUI/Application.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public function run(array $argv): int
228228
(new TestDoxHtmlRenderer)->render($testDoxResult),
229229
);
230230
} catch (DirectoryDoesNotExistException|InvalidSocketException $e) {
231-
EventFacade::emitter()->testRunnerTriggeredWarning(
231+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
232232
sprintf(
233233
'Cannot log test results in TestDox HTML format to "%s": %s',
234234
$configuration->logfileTestdoxHtml(),
@@ -245,7 +245,7 @@ public function run(array $argv): int
245245
(new TestDoxTextRenderer)->render($testDoxResult),
246246
);
247247
} catch (DirectoryDoesNotExistException|InvalidSocketException $e) {
248-
EventFacade::emitter()->testRunnerTriggeredWarning(
248+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
249249
sprintf(
250250
'Cannot log test results in TestDox plain text format to "%s": %s',
251251
$configuration->logfileTestdoxText(),
@@ -642,7 +642,7 @@ private function registerLogfileWriters(Configuration $configuration): void
642642
EventFacade::instance(),
643643
);
644644
} catch (DirectoryDoesNotExistException|InvalidSocketException $e) {
645-
EventFacade::emitter()->testRunnerTriggeredWarning(
645+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
646646
sprintf(
647647
'Cannot log test results in JUnit XML format to "%s": %s',
648648
$configuration->logfileJunit(),
@@ -661,7 +661,7 @@ private function registerLogfileWriters(Configuration $configuration): void
661661
EventFacade::instance(),
662662
);
663663
} catch (DirectoryDoesNotExistException|InvalidSocketException $e) {
664-
EventFacade::emitter()->testRunnerTriggeredWarning(
664+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
665665
sprintf(
666666
'Cannot log test results in TeamCity format to "%s": %s',
667667
$configuration->logfileTeamcity(),
@@ -727,7 +727,7 @@ private function configureBaseline(Configuration $configuration): ?BaselineGener
727727
try {
728728
$baseline = (new Reader)->read($baselineFile);
729729
} catch (CannotLoadBaselineException $e) {
730-
EventFacade::emitter()->testRunnerTriggeredWarning($e->getMessage());
730+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning($e->getMessage());
731731
}
732732

733733
if ($baseline !== null) {
@@ -809,7 +809,7 @@ private function configureDeprecationTriggers(Configuration $configuration): voi
809809

810810
foreach ($configuration->source()->deprecationTriggers()['functions'] as $function) {
811811
if (!function_exists($function)) {
812-
EventFacade::emitter()->testRunnerTriggeredWarning(
812+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
813813
sprintf(
814814
'Function %s cannot be configured as a deprecation trigger because it is not declared',
815815
$function,
@@ -824,7 +824,7 @@ private function configureDeprecationTriggers(Configuration $configuration): voi
824824

825825
foreach ($configuration->source()->deprecationTriggers()['methods'] as $method) {
826826
if (!str_contains($method, '::')) {
827-
EventFacade::emitter()->testRunnerTriggeredWarning(
827+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
828828
sprintf(
829829
'%s cannot be configured as a deprecation trigger because it is not in ClassName::methodName format',
830830
$method,
@@ -837,7 +837,7 @@ private function configureDeprecationTriggers(Configuration $configuration): voi
837837
[$className, $methodName] = explode('::', $method);
838838

839839
if (!class_exists($className) || !method_exists($className, $methodName)) {
840-
EventFacade::emitter()->testRunnerTriggeredWarning(
840+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
841841
sprintf(
842842
'Method %s::%s cannot be configured as a deprecation trigger because it is not declared',
843843
$className,

‎src/TextUI/Configuration/Cli/Builder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1092,7 +1092,7 @@ private function markProcessed(string $option): void
10921092
$this->processed[$option]++;
10931093

10941094
if ($this->processed[$option] === 2) {
1095-
EventFacade::emitter()->testRunnerTriggeredWarning(
1095+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
10961096
sprintf(
10971097
'Option %s cannot be used more than once',
10981098
$option,

0 commit comments

Comments
 (0)