Skip to content

Commit 8842d28

Browse files
Merge branch '5.4' into 6.3
* 5.4: [Tests] Streamline [Validator] updated Romanian translation
2 parents c8af292 + e82ccb8 commit 8842d28

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
@@ -192,7 +192,7 @@ public function testMappingTypeDetection()
192192
$this->assertSame($mappingType, 'attribute');
193193
}
194194

195-
public static function providerBasicDrivers()
195+
public static function providerBasicDrivers(): array
196196
{
197197
return [
198198
['doctrine.orm.cache.apc.class', ['type' => 'apc']],
@@ -271,7 +271,7 @@ public function testUnrecognizedCacheDriverException()
271271
$this->invokeLoadCacheDriver($objectManager, $container, $cacheName);
272272
}
273273

274-
public static function providerBundles()
274+
public static function providerBundles(): iterable
275275
{
276276
yield ['AnnotationsBundle', 'attribute', '/Entity'];
277277
yield ['AnnotationsOneLineBundle', 'attribute', '/Entity'];

Tests/Form/Type/EntityTypeTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public function testChoiceTranslationDomainIsDisabledByDefault($expanded)
158158
}
159159
}
160160

161-
public static function choiceTranslationDomainProvider()
161+
public static function choiceTranslationDomainProvider(): array
162162
{
163163
return [
164164
[false],
@@ -238,8 +238,6 @@ public function testConfigureQueryBuilderWithClosureReturningNonQueryBuilder()
238238
'class' => self::SINGLE_IDENT_CLASS,
239239
'query_builder' => fn () => new \stdClass(),
240240
]);
241-
242-
$field->submit('2');
243241
}
244242

245243
public function testConfigureQueryBuilderWithClosureReturningNullUseDefault()

Tests/Validator/Constraints/UniqueEntityValidatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ public function testValidateResultTypes($entity1, $result)
483483
$this->assertNoViolation();
484484
}
485485

486-
public static function resultTypesProvider()
486+
public static function resultTypesProvider(): array
487487
{
488488
$entity = new SingleIntIdEntity(1, 'foo');
489489

0 commit comments

Comments
 (0)