Skip to content

Commit

Permalink
Merge branch '10.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
@sebastianbergmann
sebastianbergmann committed Jan 17, 2024
2 parents c7a9a16 + 4e83538 commit 7c25aa9
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .phive/phars.xml
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="phpab" version="^1.25" installed="1.29.0" location="./tools/phpab" copy="true"/>
<phar name="php-cs-fixer" version="^3.0" installed="3.46.0" location="./tools/php-cs-fixer" copy="true"/>
<phar name="php-cs-fixer" version="^3.0" installed="3.47.1" location="./tools/php-cs-fixer" copy="true"/>
<phar name="psalm" version="^5.0" installed="5.19.0" location="./tools/psalm" copy="true"/>
<phar name="humbug/php-scoper" version="^0.18" installed="0.18.10" location="./tools/php-scoper" copy="true"/>
<phar name="composer" version="^2.0.3" installed="2.6.6" location="./tools/composer" copy="true"/>
Expand Down
26 changes: 13 additions & 13 deletions src/Event/Emitter/DispatchingEmitter.php
View file
Expand Up @@ -322,7 +322,7 @@ public function testPreparationFailed(Code\Test $test): void
* @throws InvalidArgumentException
* @throws UnknownEventTypeException
*/
public function testBeforeFirstTestMethodCalled(string $testClassName, Code\ClassMethod $calledMethod): void
public function testBeforeFirstTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
{
$this->dispatcher->dispatch(
new Test\BeforeFirstTestMethodCalled(
Expand All @@ -339,7 +339,7 @@ public function testBeforeFirstTestMethodCalled(string $testClassName, Code\Clas
* @throws InvalidArgumentException
* @throws UnknownEventTypeException
*/
public function testBeforeFirstTestMethodErrored(string $testClassName, Code\ClassMethod $calledMethod, Throwable $throwable): void
public function testBeforeFirstTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void
{
$this->dispatcher->dispatch(
new Test\BeforeFirstTestMethodErrored(
Expand All @@ -357,7 +357,7 @@ public function testBeforeFirstTestMethodErrored(string $testClassName, Code\Cla
* @throws InvalidArgumentException
* @throws UnknownEventTypeException
*/
public function testBeforeFirstTestMethodFinished(string $testClassName, Code\ClassMethod ...$calledMethods): void
public function testBeforeFirstTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
{
$this->dispatcher->dispatch(
new Test\BeforeFirstTestMethodFinished(
Expand All @@ -374,7 +374,7 @@ public function testBeforeFirstTestMethodFinished(string $testClassName, Code\Cl
* @throws InvalidArgumentException
* @throws UnknownEventTypeException
*/
public function testBeforeTestMethodCalled(string $testClassName, Code\ClassMethod $calledMethod): void
public function testBeforeTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
{
$this->dispatcher->dispatch(
new Test\BeforeTestMethodCalled(
Expand All @@ -391,7 +391,7 @@ public function testBeforeTestMethodCalled(string $testClassName, Code\ClassMeth
* @throws InvalidArgumentException
* @throws UnknownEventTypeException
*/
public function testBeforeTestMethodFinished(string $testClassName, Code\ClassMethod ...$calledMethods): void
public function testBeforeTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
{
$this->dispatcher->dispatch(
new Test\BeforeTestMethodFinished(
Expand All @@ -408,7 +408,7 @@ public function testBeforeTestMethodFinished(string $testClassName, Code\ClassMe
* @throws InvalidArgumentException
* @throws UnknownEventTypeException
*/
public function testPreConditionCalled(string $testClassName, Code\ClassMethod $calledMethod): void
public function testPreConditionCalled(string $testClassName, ClassMethod $calledMethod): void
{
$this->dispatcher->dispatch(
new Test\PreConditionCalled(
Expand All @@ -425,7 +425,7 @@ public function testPreConditionCalled(string $testClassName, Code\ClassMethod $
* @throws InvalidArgumentException
* @throws UnknownEventTypeException
*/
public function testPreConditionFinished(string $testClassName, Code\ClassMethod ...$calledMethods): void
public function testPreConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void
{
$this->dispatcher->dispatch(
new Test\PreConditionFinished(
Expand Down Expand Up @@ -971,7 +971,7 @@ public function testFinished(Code\Test $test, int $numberOfAssertionsPerformed):
* @throws InvalidArgumentException
* @throws UnknownEventTypeException
*/
public function testPostConditionCalled(string $testClassName, Code\ClassMethod $calledMethod): void
public function testPostConditionCalled(string $testClassName, ClassMethod $calledMethod): void
{
$this->dispatcher->dispatch(
new Test\PostConditionCalled(
Expand All @@ -988,7 +988,7 @@ public function testPostConditionCalled(string $testClassName, Code\ClassMethod
* @throws InvalidArgumentException
* @throws UnknownEventTypeException
*/
public function testPostConditionFinished(string $testClassName, Code\ClassMethod ...$calledMethods): void
public function testPostConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void
{
$this->dispatcher->dispatch(
new Test\PostConditionFinished(
Expand All @@ -1005,7 +1005,7 @@ public function testPostConditionFinished(string $testClassName, Code\ClassMetho
* @throws InvalidArgumentException
* @throws UnknownEventTypeException
*/
public function testAfterTestMethodCalled(string $testClassName, Code\ClassMethod $calledMethod): void
public function testAfterTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
{
$this->dispatcher->dispatch(
new Test\AfterTestMethodCalled(
Expand All @@ -1022,7 +1022,7 @@ public function testAfterTestMethodCalled(string $testClassName, Code\ClassMetho
* @throws InvalidArgumentException
* @throws UnknownEventTypeException
*/
public function testAfterTestMethodFinished(string $testClassName, Code\ClassMethod ...$calledMethods): void
public function testAfterTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
{
$this->dispatcher->dispatch(
new Test\AfterTestMethodFinished(
Expand All @@ -1039,7 +1039,7 @@ public function testAfterTestMethodFinished(string $testClassName, Code\ClassMet
* @throws InvalidArgumentException
* @throws UnknownEventTypeException
*/
public function testAfterLastTestMethodCalled(string $testClassName, Code\ClassMethod $calledMethod): void
public function testAfterLastTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void
{
$this->dispatcher->dispatch(
new Test\AfterLastTestMethodCalled(
Expand All @@ -1056,7 +1056,7 @@ public function testAfterLastTestMethodCalled(string $testClassName, Code\ClassM
* @throws InvalidArgumentException
* @throws UnknownEventTypeException
*/
public function testAfterLastTestMethodFinished(string $testClassName, Code\ClassMethod ...$calledMethods): void
public function testAfterLastTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void
{
$this->dispatcher->dispatch(
new Test\AfterLastTestMethodFinished(
Expand Down
26 changes: 13 additions & 13 deletions src/Event/Emitter/Emitter.php
View file
Expand Up @@ -65,37 +65,37 @@ public function testPreparationFailed(Code\Test $test): void;
/**
* @psalm-param class-string $testClassName
*/
public function testBeforeFirstTestMethodCalled(string $testClassName, Code\ClassMethod $calledMethod): void;
public function testBeforeFirstTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void;

/**
* @psalm-param class-string $testClassName
*/
public function testBeforeFirstTestMethodErrored(string $testClassName, Code\ClassMethod $calledMethod, Throwable $throwable): void;
public function testBeforeFirstTestMethodErrored(string $testClassName, ClassMethod $calledMethod, Throwable $throwable): void;

/**
* @psalm-param class-string $testClassName
*/
public function testBeforeFirstTestMethodFinished(string $testClassName, Code\ClassMethod ...$calledMethods): void;
public function testBeforeFirstTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;

/**
* @psalm-param class-string $testClassName
*/
public function testBeforeTestMethodCalled(string $testClassName, Code\ClassMethod $calledMethod): void;
public function testBeforeTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void;

/**
* @psalm-param class-string $testClassName
*/
public function testBeforeTestMethodFinished(string $testClassName, Code\ClassMethod ...$calledMethods): void;
public function testBeforeTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;

/**
* @psalm-param class-string $testClassName
*/
public function testPreConditionCalled(string $testClassName, Code\ClassMethod $calledMethod): void;
public function testPreConditionCalled(string $testClassName, ClassMethod $calledMethod): void;

/**
* @psalm-param class-string $testClassName
*/
public function testPreConditionFinished(string $testClassName, Code\ClassMethod ...$calledMethods): void;
public function testPreConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void;

public function testPrepared(Code\Test $test): void;

Expand Down Expand Up @@ -242,32 +242,32 @@ public function testFinished(Code\Test $test, int $numberOfAssertionsPerformed):
/**
* @psalm-param class-string $testClassName
*/
public function testPostConditionCalled(string $testClassName, Code\ClassMethod $calledMethod): void;
public function testPostConditionCalled(string $testClassName, ClassMethod $calledMethod): void;

/**
* @psalm-param class-string $testClassName
*/
public function testPostConditionFinished(string $testClassName, Code\ClassMethod ...$calledMethods): void;
public function testPostConditionFinished(string $testClassName, ClassMethod ...$calledMethods): void;

/**
* @psalm-param class-string $testClassName
*/
public function testAfterTestMethodCalled(string $testClassName, Code\ClassMethod $calledMethod): void;
public function testAfterTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void;

/**
* @psalm-param class-string $testClassName
*/
public function testAfterTestMethodFinished(string $testClassName, Code\ClassMethod ...$calledMethods): void;
public function testAfterTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;

/**
* @psalm-param class-string $testClassName
*/
public function testAfterLastTestMethodCalled(string $testClassName, Code\ClassMethod $calledMethod): void;
public function testAfterLastTestMethodCalled(string $testClassName, ClassMethod $calledMethod): void;

/**
* @psalm-param class-string $testClassName
*/
public function testAfterLastTestMethodFinished(string $testClassName, Code\ClassMethod ...$calledMethods): void;
public function testAfterLastTestMethodFinished(string $testClassName, ClassMethod ...$calledMethods): void;

public function testSuiteFinished(TestSuite $testSuite): void;

Expand Down
3 changes: 1 addition & 2 deletions src/Runner/Extension/ExtensionBootstrapper.php
View file
Expand Up @@ -14,7 +14,6 @@
use function class_implements;
use function in_array;
use function sprintf;
use PHPUnit\Event;
use PHPUnit\Event\Facade as EventFacade;
use PHPUnit\TextUI\Configuration\Configuration;
use ReflectionClass;
Expand Down Expand Up @@ -87,7 +86,7 @@ public function bootstrap(string $className, array $parameters): void
return;
}

Event\Facade::emitter()->testRunnerBootstrappedExtension(
EventFacade::emitter()->testRunnerBootstrappedExtension(
$className,
$parameters,
);
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Event/Value/Telemetry/SystemTest.php
View file
Expand Up @@ -24,7 +24,7 @@ public function testSnapshotReturnsSnapshot(): void

$clock = new class($time) implements StopWatch
{
private readonly \PHPUnit\Event\Telemetry\HRTime $time;
private readonly HRTime $time;

public function __construct(HRTime $time)
{
Expand Down
Binary file modified tools/php-cs-fixer
View file
Binary file not shown.

0 comments on commit 7c25aa9

Please sign in to comment.