Skip to content

Commit 2be2876

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '10.5' into 11.5
2 parents efa6c0f + 0077cb2 commit 2be2876

File tree

15 files changed

+46
-46
lines changed

15 files changed

+46
-46
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
@@ -1203,7 +1203,7 @@ public function testSuiteFinished(TestSuite $testSuite): void
12031203
* @throws InvalidArgumentException
12041204
* @throws UnknownEventTypeException
12051205
*/
1206-
public function testRunnerTriggeredDeprecation(string $message): void
1206+
public function testRunnerTriggeredPhpunitDeprecation(string $message): void
12071207
{
12081208
$this->dispatcher->dispatch(
12091209
new TestRunner\DeprecationTriggered(
@@ -1217,7 +1217,7 @@ public function testRunnerTriggeredDeprecation(string $message): void
12171217
* @throws InvalidArgumentException
12181218
* @throws UnknownEventTypeException
12191219
*/
1220-
public function testRunnerTriggeredWarning(string $message): void
1220+
public function testRunnerTriggeredPhpunitWarning(string $message): void
12211221
{
12221222
$this->dispatcher->dispatch(
12231223
new TestRunner\WarningTriggered(

‎src/Event/Emitter/Emitter.php

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

308308
public function testRunnerFinishedChildProcess(string $stdout, string $stderr): void;
309309

310-
public function testRunnerTriggeredDeprecation(string $message): void;
310+
public function testRunnerTriggeredPhpunitDeprecation(string $message): void;
311311

312-
public function testRunnerTriggeredWarning(string $message): void;
312+
public function testRunnerTriggeredPhpunitWarning(string $message): void;
313313

314314
public function testRunnerEnabledGarbageCollection(): void;
315315

‎src/Framework/MockObject/Generator/Generator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ private function generateCodeForTestDoubleClass(string $type, bool $mockObject,
848848
$message,
849849
);
850850
} catch (NoTestCaseObjectOnCallStackException) {
851-
EventFacade::emitter()->testRunnerTriggeredDeprecation($message);
851+
EventFacade::emitter()->testRunnerTriggeredPhpunitDeprecation($message);
852852
}
853853
}
854854

‎src/Framework/MockObject/Runtime/Api/MockObjectApi.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function expects(InvocationOrder $matcher): InvocationMockerBuilder
6565
}
6666
// @codeCoverageIgnoreStart
6767
} catch (NoTestCaseObjectOnCallStackException) {
68-
EventFacade::emitter()->testRunnerTriggeredDeprecation($message);
68+
EventFacade::emitter()->testRunnerTriggeredPhpunitDeprecation($message);
6969
// @codeCoverageIgnoreEnd
7070
}
7171
}

‎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/AnnotationParser.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public function forClass(string $className): MetadataCollection
174174
),
175175
);
176176
} catch (InvalidVersionRequirementException $e) {
177-
EventFacade::emitter()->testRunnerTriggeredWarning(
177+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
178178
sprintf(
179179
'Class %s is annotated using an invalid version requirement: %s',
180180
$className,
@@ -186,7 +186,7 @@ public function forClass(string $className): MetadataCollection
186186
if (!empty($result) &&
187187
!isset(self::$deprecationEmittedForClass[$className]) &&
188188
!str_starts_with($className, 'PHPUnit\TestFixture')) {
189-
EventFacade::emitter()->testRunnerTriggeredDeprecation(
189+
EventFacade::emitter()->testRunnerTriggeredPhpunitDeprecation(
190190
sprintf(
191191
'Metadata found in doc-comment for class %s. Metadata in doc-comments is deprecated and will no longer be supported in PHPUnit 12. Update your test code to use attributes instead.',
192192
$className,
@@ -417,7 +417,7 @@ public function forMethod(string $className, string $methodName): MetadataCollec
417417
),
418418
);
419419
} catch (InvalidVersionRequirementException $e) {
420-
EventFacade::emitter()->testRunnerTriggeredWarning(
420+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
421421
sprintf(
422422
'Method %s::%s is annotated using an invalid version requirement: %s',
423423
$className,
@@ -431,7 +431,7 @@ public function forMethod(string $className, string $methodName): MetadataCollec
431431
if (!empty($result) &&
432432
!isset(self::$deprecationEmittedForMethod[$className . '::' . $methodName]) &&
433433
!str_starts_with($className, 'PHPUnit\TestFixture')) {
434-
EventFacade::emitter()->testRunnerTriggeredDeprecation(
434+
EventFacade::emitter()->testRunnerTriggeredPhpunitDeprecation(
435435
sprintf(
436436
'Metadata found in doc-comment for method %s::%s(). Metadata in doc-comments is deprecated and will no longer be supported in PHPUnit 12. Update your test code to use attributes instead.',
437437
$className,

‎src/Metadata/Parser/AttributeParser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ private function isSizeGroup(string $groupName, string $testClassName, ?string $
786786
return false;
787787
}
788788

789-
EventFacade::emitter()->testRunnerTriggeredWarning(
789+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
790790
sprintf(
791791
'Group name "%s" is not allowed for %s %s%s%s',
792792
$_groupName,

‎src/Runner/CodeCoverage.php

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

106106
if ($codeCoverageFilterRegistry->get()->isEmpty()) {
107107
if (!$codeCoverageFilterRegistry->configured()) {
108-
EventFacade::emitter()->testRunnerTriggeredWarning(
108+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
109109
'No filter is configured, code coverage will not be processed',
110110
);
111111
} else {
112-
EventFacade::emitter()->testRunnerTriggeredWarning(
112+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
113113
'Incorrect filter configuration, code coverage will not be processed',
114114
);
115115
}
@@ -349,7 +349,7 @@ private function activate(Filter $filter, bool $pathCoverage): void
349349
$filter,
350350
);
351351
} catch (CodeCoverageException $e) {
352-
EventFacade::emitter()->testRunnerTriggeredWarning(
352+
EventFacade::emitter()->testRunnerTriggeredPhpunitWarning(
353353
$e->getMessage(),
354354
);
355355
}

‎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,

0 commit comments

Comments
 (0)