minor #52375 Fix tests (OskarStark)

xabbuh · xabbuh · commit 203f62901cba · 2023-10-31T10:12:00.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- Fix tests | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | -- | License | MIT ``` src/Symfony/Bridge/Twig 0s + /home/runner/work/symfony/symfony/phpunit --exclude-group tty,benchmark,intl-data,integration src/Symfony/Bridge/Twig PHP Fatal error: Declaration of Symfony\Bridge\Twig\Tests\Extension\FormExtensionDivLayoutTest::renderForm(Symfony\Component\Form\FormView $view, array $vars = []) must be compatible with Symfony\Bridge\Twig\Test\FormLayoutTestCase::renderForm(Symfony\Component\Form\FormView $view, array $vars = []): string in /home/runner/work/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php on line 298 ``` Commits ------- 1bff654 Fix tests
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -295,12 +295,12 @@ public function testLabelHtmlIsTrue()
         $this->assertMatchesXpath($html, '/label[@for="name"][@class="my&class required"]/b[.="Bolded label"]');
     }
 
-    protected function renderForm(FormView $view, array $vars = [])
+    protected function renderForm(FormView $view, array $vars = []): string
     {
         return $this->renderer->renderBlock($view, 'form', $vars);
     }
 
-    protected function renderLabel(FormView $view, $label = null, array $vars = [])
+    protected function renderLabel(FormView $view, $label = null, array $vars = []): string
     {
         if (null !== $label) {
             $vars += ['label' => $label];
@@ -309,42 +309,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])
         return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
     }
 
-    protected function renderHelp(FormView $view)
+    protected function renderHelp(FormView $view): string
     {
         return $this->renderer->searchAndRenderBlock($view, 'help');
     }
 
-    protected function renderErrors(FormView $view)
+    protected function renderErrors(FormView $view): string
     {
         return $this->renderer->searchAndRenderBlock($view, 'errors');
     }
 
-    protected function renderWidget(FormView $view, array $vars = [])
+    protected function renderWidget(FormView $view, array $vars = []): string
     {
         return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
     }
 
-    protected function renderRow(FormView $view, array $vars = [])
+    protected function renderRow(FormView $view, array $vars = []): string
     {
         return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
     }
 
-    protected function renderRest(FormView $view, array $vars = [])
+    protected function renderRest(FormView $view, array $vars = []): string
     {
         return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
     }
 
-    protected function renderStart(FormView $view, array $vars = [])
+    protected function renderStart(FormView $view, array $vars = []): string
     {
         return $this->renderer->renderBlock($view, 'form_start', $vars);
     }
 
-    protected function renderEnd(FormView $view, array $vars = [])
+    protected function renderEnd(FormView $view, array $vars = []): string
     {
         return $this->renderer->renderBlock($view, 'form_end', $vars);
     }
 
-    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
+    protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true): void
     {
         $this->renderer->setTheme($view, $themes, $useDefaultThemes);
     }

Original file line number	Diff line number	Diff line change
`@@ -295,12 +295,12 @@ public function testLabelHtmlIsTrue()`
`295`	`295`	`$this->assertMatchesXpath($html, '/label[@for="name"][@class="my&class required"]/b[.="Bolded label"]');`
`296`	`296`	`}`
`297`	`297`
`298`		`- protected function renderForm(FormView $view, array $vars = [])`
	`298`	`+ protected function renderForm(FormView $view, array $vars = []): string`
`299`	`299`	`{`
`300`	`300`	`return $this->renderer->renderBlock($view, 'form', $vars);`
`301`	`301`	`}`
`302`	`302`
`303`		`- protected function renderLabel(FormView $view, $label = null, array $vars = [])`
	`303`	`+ protected function renderLabel(FormView $view, $label = null, array $vars = []): string`
`304`	`304`	`{`
`305`	`305`	`if (null !== $label) {`
`306`	`306`	`$vars += ['label' => $label];`
`@@ -309,42 +309,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])`
`309`	`309`	`return $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
`310`	`310`	`}`
`311`	`311`
`312`		`- protected function renderHelp(FormView $view)`
	`312`	`+ protected function renderHelp(FormView $view): string`
`313`	`313`	`{`
`314`	`314`	`return $this->renderer->searchAndRenderBlock($view, 'help');`
`315`	`315`	`}`
`316`	`316`
`317`		`- protected function renderErrors(FormView $view)`
	`317`	`+ protected function renderErrors(FormView $view): string`
`318`	`318`	`{`
`319`	`319`	`return $this->renderer->searchAndRenderBlock($view, 'errors');`
`320`	`320`	`}`
`321`	`321`
`322`		`- protected function renderWidget(FormView $view, array $vars = [])`
	`322`	`+ protected function renderWidget(FormView $view, array $vars = []): string`
`323`	`323`	`{`
`324`	`324`	`return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
`325`	`325`	`}`
`326`	`326`
`327`		`- protected function renderRow(FormView $view, array $vars = [])`
	`327`	`+ protected function renderRow(FormView $view, array $vars = []): string`
`328`	`328`	`{`
`329`	`329`	`return $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
`330`	`330`	`}`
`331`	`331`
`332`		`- protected function renderRest(FormView $view, array $vars = [])`
	`332`	`+ protected function renderRest(FormView $view, array $vars = []): string`
`333`	`333`	`{`
`334`	`334`	`return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
`335`	`335`	`}`
`336`	`336`
`337`		`- protected function renderStart(FormView $view, array $vars = [])`
	`337`	`+ protected function renderStart(FormView $view, array $vars = []): string`
`338`	`338`	`{`
`339`	`339`	`return $this->renderer->renderBlock($view, 'form_start', $vars);`
`340`	`340`	`}`
`341`	`341`
`342`		`- protected function renderEnd(FormView $view, array $vars = [])`
	`342`	`+ protected function renderEnd(FormView $view, array $vars = []): string`
`343`	`343`	`{`
`344`	`344`	`return $this->renderer->renderBlock($view, 'form_end', $vars);`
`345`	`345`	`}`
`346`	`346`
`347`		`- protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)`
	`347`	`+ protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true): void`
`348`	`348`	`{`
`349`	`349`	`$this->renderer->setTheme($view, $themes, $useDefaultThemes);`
`350`	`350`	`}`