Skip to content

Commit 164b48e

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 33fa61e + 3c749a5 commit 164b48e

File tree

3 files changed

+60
-6
lines changed

3 files changed

+60
-6
lines changed

Tests/AppVariableTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function testDebug($debugFlag)
4141
$this->assertEquals($debugFlag, $this->appVariable->getDebug());
4242
}
4343

44-
public static function debugDataProvider()
44+
public static function debugDataProvider(): array
4545
{
4646
return [
4747
'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: 58 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function testThemeBlockInheritanceUsingDynamicExtend()
6868
);
6969
}
7070

71-
public static function isSelectedChoiceProvider()
71+
public static function isSelectedChoiceProvider(): array
7272
{
7373
return [
7474
[true, '0', '0'],
@@ -118,7 +118,7 @@ public function testStartTagHasActionAttributeWhenActionIsZero()
118118
$this->assertSame('<form name="form" method="get" action="0">', $html);
119119
}
120120

121-
public static function isRootFormProvider()
121+
public static function isRootFormProvider(): array
122122
{
123123
return [
124124
[true, new FormView()],
@@ -295,14 +295,68 @@ public function testLabelHtmlIsTrue()
295295
$this->assertMatchesXpath($html, '/label[@for="name"][@class="my&class required"]/b[.="Bolded label"]');
296296
}
297297

298-
public static function themeBlockInheritanceProvider()
298+
protected function renderForm(FormView $view, array $vars = [])
299+
{
300+
return $this->renderer->renderBlock($view, 'form', $vars);
301+
}
302+
303+
protected function renderLabel(FormView $view, $label = null, array $vars = [])
304+
{
305+
if (null !== $label) {
306+
$vars += ['label' => $label];
307+
}
308+
309+
return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
310+
}
311+
312+
protected function renderHelp(FormView $view)
313+
{
314+
return $this->renderer->searchAndRenderBlock($view, 'help');
315+
}
316+
317+
protected function renderErrors(FormView $view)
318+
{
319+
return $this->renderer->searchAndRenderBlock($view, 'errors');
320+
}
321+
322+
protected function renderWidget(FormView $view, array $vars = [])
323+
{
324+
return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
325+
}
326+
327+
protected function renderRow(FormView $view, array $vars = [])
328+
{
329+
return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
330+
}
331+
332+
protected function renderRest(FormView $view, array $vars = [])
333+
{
334+
return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
335+
}
336+
337+
protected function renderStart(FormView $view, array $vars = [])
338+
{
339+
return $this->renderer->renderBlock($view, 'form_start', $vars);
340+
}
341+
342+
protected function renderEnd(FormView $view, array $vars = [])
343+
{
344+
return $this->renderer->renderBlock($view, 'form_end', $vars);
345+
}
346+
347+
protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
348+
{
349+
$this->renderer->setTheme($view, $themes, $useDefaultThemes);
350+
}
351+
352+
public static function themeBlockInheritanceProvider(): array
299353
{
300354
return [
301355
[['theme.html.twig']],
302356
];
303357
}
304358

305-
public static function themeInheritanceProvider()
359+
public static function themeInheritanceProvider(): array
306360
{
307361
return [
308362
[['parent_label.html.twig'], ['child_label.html.twig']],

0 commit comments

Comments
 (0)