Skip to content

Commit 73f881e

Browse files
Merge branch '6.3' into 6.4
* 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
2 parents 175eed1 + 8842d28 commit 73f881e

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

Tests/DependencyInjection/DoctrineExtensionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public function testMappingTypeDetection()
190190
$this->assertSame($mappingType, 'attribute');
191191
}
192192

193-
public static function providerBasicDrivers()
193+
public static function providerBasicDrivers(): array
194194
{
195195
return [
196196
['doctrine.orm.cache.apc.class', ['type' => 'apc']],
@@ -269,7 +269,7 @@ public function testUnrecognizedCacheDriverException()
269269
$this->invokeLoadCacheDriver($objectManager, $container, $cacheName);
270270
}
271271

272-
public static function providerBundles()
272+
public static function providerBundles(): iterable
273273
{
274274
yield ['AnnotationsBundle', 'attribute', '/Entity'];
275275
yield ['AnnotationsOneLineBundle', 'attribute', '/Entity'];

Tests/Form/Type/EntityTypeTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public function testChoiceTranslationDomainIsDisabledByDefault($expanded)
143143
}
144144
}
145145

146-
public static function choiceTranslationDomainProvider()
146+
public static function choiceTranslationDomainProvider(): array
147147
{
148148
return [
149149
[false],
@@ -223,8 +223,6 @@ public function testConfigureQueryBuilderWithClosureReturningNonQueryBuilder()
223223
'class' => self::SINGLE_IDENT_CLASS,
224224
'query_builder' => fn () => new \stdClass(),
225225
]);
226-
227-
$field->submit('2');
228226
}
229227

230228
public function testConfigureQueryBuilderWithClosureReturningNullUseDefault()

Tests/Validator/Constraints/UniqueEntityValidatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ public function testValidateResultTypes($entity1, $result)
471471
$this->assertNoViolation();
472472
}
473473

474-
public static function resultTypesProvider()
474+
public static function resultTypesProvider(): array
475475
{
476476
$entity = new SingleIntIdEntity(1, 'foo');
477477

0 commit comments

Comments
 (0)