Skip to content

Commit

Permalink
Merge branch '5.4' into 6.3
Browse files Browse the repository at this point in the history
* 5.4:
  [Tests] Streamline
  [Validator] updated Romanian translation
  • Loading branch information
nicolas-grekas committed Oct 31, 2023
2 parents 18f2cbe + cbe9acb commit 3c749a5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Tests/AppVariableTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function testDebug($debugFlag)
$this->assertEquals($debugFlag, $this->appVariable->getDebug());
}

public static function debugDataProvider()
public static function debugDataProvider(): array
{
return [
'debug on' => [true],
Expand Down
2 changes: 1 addition & 1 deletion Tests/Command/LintCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public function testComplete(array $input, array $expectedSuggestions)
$this->assertSame($expectedSuggestions, $tester->complete($input));
}

public static function provideCompletionSuggestions()
public static function provideCompletionSuggestions(): iterable
{
yield 'option' => [['--format', ''], ['txt', 'json', 'github']];
}
Expand Down
8 changes: 4 additions & 4 deletions Tests/Extension/FormExtensionDivLayoutTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public function testThemeBlockInheritanceUsingDynamicExtend()
);
}

public static function isSelectedChoiceProvider()
public static function isSelectedChoiceProvider(): array
{
return [
[true, '0', '0'],
Expand Down Expand Up @@ -149,7 +149,7 @@ public function testStartTagHasActionAttributeWhenActionIsZero()
$this->assertSame('<form name="form" method="get" action="0">', $html);
}

public static function isRootFormProvider()
public static function isRootFormProvider(): array
{
return [
[true, new FormView()],
Expand Down Expand Up @@ -380,14 +380,14 @@ protected function setTheme(FormView $view, array $themes, $useDefaultThemes = t
$this->renderer->setTheme($view, $themes, $useDefaultThemes);
}

public static function themeBlockInheritanceProvider()
public static function themeBlockInheritanceProvider(): array
{
return [
[['theme.html.twig']],
];
}

public static function themeInheritanceProvider()
public static function themeInheritanceProvider(): array
{
return [
[['parent_label.html.twig'], ['child_label.html.twig']],
Expand Down

0 comments on commit 3c749a5

Please sign in to comment.