Skip to content

Commit 3c749a5

Browse files
Merge branch '5.4' into 6.3
* 5.4: [Tests] Streamline [Validator] updated Romanian translation
2 parents 18f2cbe + cbe9acb commit 3c749a5

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Tests/AppVariableTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function testDebug($debugFlag)
4444
$this->assertEquals($debugFlag, $this->appVariable->getDebug());
4545
}
4646

47-
public static function debugDataProvider()
47+
public static function debugDataProvider(): array
4848
{
4949
return [
5050
'debug on' => [true],

Tests/Command/LintCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function testComplete(array $input, array $expectedSuggestions)
146146
$this->assertSame($expectedSuggestions, $tester->complete($input));
147147
}
148148

149-
public static function provideCompletionSuggestions()
149+
public static function provideCompletionSuggestions(): iterable
150150
{
151151
yield 'option' => [['--format', ''], ['txt', 'json', 'github']];
152152
}

Tests/Extension/FormExtensionDivLayoutTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public function testThemeBlockInheritanceUsingDynamicExtend()
9999
);
100100
}
101101

102-
public static function isSelectedChoiceProvider()
102+
public static function isSelectedChoiceProvider(): array
103103
{
104104
return [
105105
[true, '0', '0'],
@@ -149,7 +149,7 @@ public function testStartTagHasActionAttributeWhenActionIsZero()
149149
$this->assertSame('<form name="form" method="get" action="0">', $html);
150150
}
151151

152-
public static function isRootFormProvider()
152+
public static function isRootFormProvider(): array
153153
{
154154
return [
155155
[true, new FormView()],
@@ -380,14 +380,14 @@ protected function setTheme(FormView $view, array $themes, $useDefaultThemes = t
380380
$this->renderer->setTheme($view, $themes, $useDefaultThemes);
381381
}
382382

383-
public static function themeBlockInheritanceProvider()
383+
public static function themeBlockInheritanceProvider(): array
384384
{
385385
return [
386386
[['theme.html.twig']],
387387
];
388388
}
389389

390-
public static function themeInheritanceProvider()
390+
public static function themeInheritanceProvider(): array
391391
{
392392
return [
393393
[['parent_label.html.twig'], ['child_label.html.twig']],

0 commit comments

Comments
 (0)