Skip to content

Commit

Permalink
Merge branch '6.3' into 6.4
Browse files Browse the repository at this point in the history
* 6.3:
  [Console] Fix horizontal table top border is incorrectly rendered
  [Tests] Streamline
  [Uid] Fix UuidV7 collisions within the same ms
  [Validator] updated Romanian translation
  • Loading branch information
nicolas-grekas committed Oct 31, 2023
2 parents 0470bb7 + 4561090 commit 36bc5bc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Tests/DeprecationErrorHandler/ConfigurationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@ public function testToleratesForIndividualGroups(string $deprecationsHelper, arr
}
}

public static function provideDataForToleratesForGroup() {

public static function provideDataForToleratesForGroup(): iterable
{
yield 'total threshold not reached' => ['max[total]=1', [
'unsilenced' => 0,
'self' => 0,
Expand Down
6 changes: 3 additions & 3 deletions Tests/DeprecationErrorHandler/DeprecationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public function testItMutesOnlySpecificErrorMessagesWhenTheCallingCodeIsInPhpuni
$this->assertSame($muted, $deprecation->isMuted());
}

public static function mutedProvider()
public static function mutedProvider(): iterable
{
yield 'not from phpunit, and not a whitelisted message' => [
false,
Expand Down Expand Up @@ -147,7 +147,7 @@ public function testItTakesMutesDeprecationFromPhpUnitFiles()
$this->assertTrue($deprecation->isMuted());
}

public static function providerGetTypeDetectsSelf()
public static function providerGetTypeDetectsSelf(): array
{
return [
'not_from_vendors_file' => [Deprecation::TYPE_SELF, '', 'MyClass1', __FILE__],
Expand Down Expand Up @@ -182,7 +182,7 @@ public function testGetTypeDetectsSelf(string $expectedType, string $message, st
$this->assertSame($expectedType, $deprecation->getType());
}

public static function providerGetTypeUsesRightTrace()
public static function providerGetTypeUsesRightTrace(): array
{
$vendorDir = self::getVendorDir();
$fakeTrace = [
Expand Down

0 comments on commit 36bc5bc

Please sign in to comment.