Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit 578a16501e7c · 2021-11-28T16:25:38.000+01:00
* 5.3:
  [Process] intersect with getenv() in case-insensitive manner to get default envs
  [Serializer] fix support for lazy/unset properties
  Fix redundant type casts
  [Notifier] Fix AllMySms bridge body content
  Revert "[DoctrineBridge] add support for the JSON type"
diff --git a/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php b/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
@@ -57,7 +57,7 @@ protected function setUp(): void
 
     protected function renderForm(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form', $vars);
+        return $this->renderer->renderBlock($view, 'form', $vars);
     }
 
     protected function renderLabel(FormView $view, $label = null, array $vars = [])
@@ -66,42 +66,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])
             $vars += ['label' => $label];
         }
 
-        return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
     }
 
     protected function renderHelp(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'help');
+        return $this->renderer->searchAndRenderBlock($view, 'help');
     }
 
     protected function renderErrors(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
+        return $this->renderer->searchAndRenderBlock($view, 'errors');
     }
 
     protected function renderWidget(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
     }
 
     protected function renderRow(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
     }
 
     protected function renderRest(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
     }
 
     protected function renderStart(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
+        return $this->renderer->renderBlock($view, 'form_start', $vars);
     }
 
     protected function renderEnd(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
+        return $this->renderer->renderBlock($view, 'form_end', $vars);
     }
 
     protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
diff --git a/Tests/Extension/FormExtensionBootstrap3LayoutTest.php b/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
@@ -107,7 +107,7 @@ public function testMoneyWidgetInIso()
 
     protected function renderForm(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form', $vars);
+        return $this->renderer->renderBlock($view, 'form', $vars);
     }
 
     protected function renderLabel(FormView $view, $label = null, array $vars = [])
@@ -116,42 +116,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])
             $vars += ['label' => $label];
         }
 
-        return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
     }
 
     protected function renderHelp(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'help');
+        return $this->renderer->searchAndRenderBlock($view, 'help');
     }
 
     protected function renderErrors(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
+        return $this->renderer->searchAndRenderBlock($view, 'errors');
     }
 
     protected function renderWidget(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
     }
 
     protected function renderRow(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
     }
 
     protected function renderRest(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
     }
 
     protected function renderStart(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
+        return $this->renderer->renderBlock($view, 'form_start', $vars);
     }
 
     protected function renderEnd(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
+        return $this->renderer->renderBlock($view, 'form_end', $vars);
     }
 
     protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
diff --git a/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php b/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
@@ -59,7 +59,7 @@ protected function setUp(): void
 
     protected function renderForm(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form', $vars);
+        return $this->renderer->renderBlock($view, 'form', $vars);
     }
 
     protected function renderLabel(FormView $view, $label = null, array $vars = [])
@@ -68,42 +68,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])
             $vars += ['label' => $label];
         }
 
-        return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
     }
 
     protected function renderHelp(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'help');
+        return $this->renderer->searchAndRenderBlock($view, 'help');
     }
 
     protected function renderErrors(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
+        return $this->renderer->searchAndRenderBlock($view, 'errors');
     }
 
     protected function renderWidget(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
     }
 
     protected function renderRow(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
     }
 
     protected function renderRest(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
     }
 
     protected function renderStart(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
+        return $this->renderer->renderBlock($view, 'form_start', $vars);
     }
 
     protected function renderEnd(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
+        return $this->renderer->renderBlock($view, 'form_end', $vars);
     }
 
     protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
diff --git a/Tests/Extension/FormExtensionBootstrap4LayoutTest.php b/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
@@ -111,7 +111,7 @@ public function testMoneyWidgetInIso()
 
     protected function renderForm(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form', $vars);
+        return $this->renderer->renderBlock($view, 'form', $vars);
     }
 
     protected function renderLabel(FormView $view, $label = null, array $vars = [])
@@ -120,42 +120,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])
             $vars += ['label' => $label];
         }
 
-        return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
     }
 
     protected function renderHelp(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'help');
+        return $this->renderer->searchAndRenderBlock($view, 'help');
     }
 
     protected function renderErrors(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
+        return $this->renderer->searchAndRenderBlock($view, 'errors');
     }
 
     protected function renderWidget(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
     }
 
     protected function renderRow(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
     }
 
     protected function renderRest(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
     }
 
     protected function renderStart(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
+        return $this->renderer->renderBlock($view, 'form_start', $vars);
     }
 
     protected function renderEnd(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
+        return $this->renderer->renderBlock($view, 'form_end', $vars);
     }
 
     protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
diff --git a/Tests/Extension/FormExtensionDivLayoutTest.php b/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -331,7 +331,7 @@ public function testLabelHtmlIsTrue()
 
     protected function renderForm(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form', $vars);
+        return $this->renderer->renderBlock($view, 'form', $vars);
     }
 
     protected function renderLabel(FormView $view, $label = null, array $vars = [])
@@ -340,42 +340,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])
             $vars += ['label' => $label];
         }
 
-        return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
     }
 
     protected function renderHelp(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'help');
+        return $this->renderer->searchAndRenderBlock($view, 'help');
     }
 
     protected function renderErrors(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
+        return $this->renderer->searchAndRenderBlock($view, 'errors');
     }
 
     protected function renderWidget(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
     }
 
     protected function renderRow(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
     }
 
     protected function renderRest(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
     }
 
     protected function renderStart(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
+        return $this->renderer->renderBlock($view, 'form_start', $vars);
     }
 
     protected function renderEnd(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
+        return $this->renderer->renderBlock($view, 'form_end', $vars);
     }
 
     protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)
diff --git a/Tests/Extension/FormExtensionTableLayoutTest.php b/Tests/Extension/FormExtensionTableLayoutTest.php
@@ -217,7 +217,7 @@ public function testLabelHtmlIsTrue()
 
     protected function renderForm(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form', $vars);
+        return $this->renderer->renderBlock($view, 'form', $vars);
     }
 
     protected function renderLabel(FormView $view, $label = null, array $vars = [])
@@ -226,42 +226,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])
             $vars += ['label' => $label];
         }
 
-        return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'label', $vars);
     }
 
     protected function renderHelp(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'help');
+        return $this->renderer->searchAndRenderBlock($view, 'help');
     }
 
     protected function renderErrors(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'errors');
+        return $this->renderer->searchAndRenderBlock($view, 'errors');
     }
 
     protected function renderWidget(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);
     }
 
     protected function renderRow(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'row', $vars);
     }
 
     protected function renderRest(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
+        return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);
     }
 
     protected function renderStart(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form_start', $vars);
+        return $this->renderer->renderBlock($view, 'form_start', $vars);
     }
 
     protected function renderEnd(FormView $view, array $vars = [])
     {
-        return (string) $this->renderer->renderBlock($view, 'form_end', $vars);
+        return $this->renderer->renderBlock($view, 'form_end', $vars);
     }
 
     protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ protected function setUp(): void`
`57`	`57`
`58`	`58`	`protected function renderForm(FormView $view, array $vars = [])`
`59`	`59`	`{`
`60`		`- return (string) $this->renderer->renderBlock($view, 'form', $vars);`
	`60`	`+ return $this->renderer->renderBlock($view, 'form', $vars);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`protected function renderLabel(FormView $view, $label = null, array $vars = [])`
`@@ -66,42 +66,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])`
`66`	`66`	`$vars += ['label' => $label];`
`67`	`67`	`}`
`68`	`68`
`69`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
	`69`	`+ return $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`protected function renderHelp(FormView $view)`
`73`	`73`	`{`
`74`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'help');`
	`74`	`+ return $this->renderer->searchAndRenderBlock($view, 'help');`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`protected function renderErrors(FormView $view)`
`78`	`78`	`{`
`79`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'errors');`
	`79`	`+ return $this->renderer->searchAndRenderBlock($view, 'errors');`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`protected function renderWidget(FormView $view, array $vars = [])`
`83`	`83`	`{`
`84`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
	`84`	`+ return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`protected function renderRow(FormView $view, array $vars = [])`
`88`	`88`	`{`
`89`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
	`89`	`+ return $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`protected function renderRest(FormView $view, array $vars = [])`
`93`	`93`	`{`
`94`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
	`94`	`+ return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`protected function renderStart(FormView $view, array $vars = [])`
`98`	`98`	`{`
`99`		`- return (string) $this->renderer->renderBlock($view, 'form_start', $vars);`
	`99`	`+ return $this->renderer->renderBlock($view, 'form_start', $vars);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`protected function renderEnd(FormView $view, array $vars = [])`
`103`	`103`	`{`
`104`		`- return (string) $this->renderer->renderBlock($view, 'form_end', $vars);`
	`104`	`+ return $this->renderer->renderBlock($view, 'form_end', $vars);`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function testMoneyWidgetInIso()`
`107`	`107`
`108`	`108`	`protected function renderForm(FormView $view, array $vars = [])`
`109`	`109`	`{`
`110`		`- return (string) $this->renderer->renderBlock($view, 'form', $vars);`
	`110`	`+ return $this->renderer->renderBlock($view, 'form', $vars);`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`protected function renderLabel(FormView $view, $label = null, array $vars = [])`
`@@ -116,42 +116,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])`
`116`	`116`	`$vars += ['label' => $label];`
`117`	`117`	`}`
`118`	`118`
`119`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
	`119`	`+ return $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`protected function renderHelp(FormView $view)`
`123`	`123`	`{`
`124`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'help');`
	`124`	`+ return $this->renderer->searchAndRenderBlock($view, 'help');`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`protected function renderErrors(FormView $view)`
`128`	`128`	`{`
`129`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'errors');`
	`129`	`+ return $this->renderer->searchAndRenderBlock($view, 'errors');`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`protected function renderWidget(FormView $view, array $vars = [])`
`133`	`133`	`{`
`134`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
	`134`	`+ return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`protected function renderRow(FormView $view, array $vars = [])`
`138`	`138`	`{`
`139`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
	`139`	`+ return $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`protected function renderRest(FormView $view, array $vars = [])`
`143`	`143`	`{`
`144`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
	`144`	`+ return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`protected function renderStart(FormView $view, array $vars = [])`
`148`	`148`	`{`
`149`		`- return (string) $this->renderer->renderBlock($view, 'form_start', $vars);`
	`149`	`+ return $this->renderer->renderBlock($view, 'form_start', $vars);`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`protected function renderEnd(FormView $view, array $vars = [])`
`153`	`153`	`{`
`154`		`- return (string) $this->renderer->renderBlock($view, 'form_end', $vars);`
	`154`	`+ return $this->renderer->renderBlock($view, 'form_end', $vars);`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ protected function setUp(): void`
`59`	`59`
`60`	`60`	`protected function renderForm(FormView $view, array $vars = [])`
`61`	`61`	`{`
`62`		`- return (string) $this->renderer->renderBlock($view, 'form', $vars);`
	`62`	`+ return $this->renderer->renderBlock($view, 'form', $vars);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`protected function renderLabel(FormView $view, $label = null, array $vars = [])`
`@@ -68,42 +68,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])`
`68`	`68`	`$vars += ['label' => $label];`
`69`	`69`	`}`
`70`	`70`
`71`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
	`71`	`+ return $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`protected function renderHelp(FormView $view)`
`75`	`75`	`{`
`76`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'help');`
	`76`	`+ return $this->renderer->searchAndRenderBlock($view, 'help');`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`protected function renderErrors(FormView $view)`
`80`	`80`	`{`
`81`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'errors');`
	`81`	`+ return $this->renderer->searchAndRenderBlock($view, 'errors');`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`protected function renderWidget(FormView $view, array $vars = [])`
`85`	`85`	`{`
`86`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
	`86`	`+ return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`protected function renderRow(FormView $view, array $vars = [])`
`90`	`90`	`{`
`91`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
	`91`	`+ return $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`protected function renderRest(FormView $view, array $vars = [])`
`95`	`95`	`{`
`96`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
	`96`	`+ return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`protected function renderStart(FormView $view, array $vars = [])`
`100`	`100`	`{`
`101`		`- return (string) $this->renderer->renderBlock($view, 'form_start', $vars);`
	`101`	`+ return $this->renderer->renderBlock($view, 'form_start', $vars);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`protected function renderEnd(FormView $view, array $vars = [])`
`105`	`105`	`{`
`106`		`- return (string) $this->renderer->renderBlock($view, 'form_end', $vars);`
	`106`	`+ return $this->renderer->renderBlock($view, 'form_end', $vars);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public function testMoneyWidgetInIso()`
`111`	`111`
`112`	`112`	`protected function renderForm(FormView $view, array $vars = [])`
`113`	`113`	`{`
`114`		`- return (string) $this->renderer->renderBlock($view, 'form', $vars);`
	`114`	`+ return $this->renderer->renderBlock($view, 'form', $vars);`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`protected function renderLabel(FormView $view, $label = null, array $vars = [])`
`@@ -120,42 +120,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])`
`120`	`120`	`$vars += ['label' => $label];`
`121`	`121`	`}`
`122`	`122`
`123`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
	`123`	`+ return $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`protected function renderHelp(FormView $view)`
`127`	`127`	`{`
`128`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'help');`
	`128`	`+ return $this->renderer->searchAndRenderBlock($view, 'help');`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`protected function renderErrors(FormView $view)`
`132`	`132`	`{`
`133`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'errors');`
	`133`	`+ return $this->renderer->searchAndRenderBlock($view, 'errors');`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`protected function renderWidget(FormView $view, array $vars = [])`
`137`	`137`	`{`
`138`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
	`138`	`+ return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`protected function renderRow(FormView $view, array $vars = [])`
`142`	`142`	`{`
`143`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
	`143`	`+ return $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`protected function renderRest(FormView $view, array $vars = [])`
`147`	`147`	`{`
`148`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
	`148`	`+ return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`protected function renderStart(FormView $view, array $vars = [])`
`152`	`152`	`{`
`153`		`- return (string) $this->renderer->renderBlock($view, 'form_start', $vars);`
	`153`	`+ return $this->renderer->renderBlock($view, 'form_start', $vars);`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`protected function renderEnd(FormView $view, array $vars = [])`
`157`	`157`	`{`
`158`		`- return (string) $this->renderer->renderBlock($view, 'form_end', $vars);`
	`158`	`+ return $this->renderer->renderBlock($view, 'form_end', $vars);`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)`
Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ public function testLabelHtmlIsTrue()`
`331`	`331`
`332`	`332`	`protected function renderForm(FormView $view, array $vars = [])`
`333`	`333`	`{`
`334`		`- return (string) $this->renderer->renderBlock($view, 'form', $vars);`
	`334`	`+ return $this->renderer->renderBlock($view, 'form', $vars);`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`protected function renderLabel(FormView $view, $label = null, array $vars = [])`
`@@ -340,42 +340,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])`
`340`	`340`	`$vars += ['label' => $label];`
`341`	`341`	`}`
`342`	`342`
`343`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
	`343`	`+ return $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
`344`	`344`	`}`
`345`	`345`
`346`	`346`	`protected function renderHelp(FormView $view)`
`347`	`347`	`{`
`348`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'help');`
	`348`	`+ return $this->renderer->searchAndRenderBlock($view, 'help');`
`349`	`349`	`}`
`350`	`350`
`351`	`351`	`protected function renderErrors(FormView $view)`
`352`	`352`	`{`
`353`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'errors');`
	`353`	`+ return $this->renderer->searchAndRenderBlock($view, 'errors');`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`protected function renderWidget(FormView $view, array $vars = [])`
`357`	`357`	`{`
`358`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
	`358`	`+ return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
`359`	`359`	`}`
`360`	`360`
`361`	`361`	`protected function renderRow(FormView $view, array $vars = [])`
`362`	`362`	`{`
`363`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
	`363`	`+ return $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
`364`	`364`	`}`
`365`	`365`
`366`	`366`	`protected function renderRest(FormView $view, array $vars = [])`
`367`	`367`	`{`
`368`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
	`368`	`+ return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	`protected function renderStart(FormView $view, array $vars = [])`
`372`	`372`	`{`
`373`		`- return (string) $this->renderer->renderBlock($view, 'form_start', $vars);`
	`373`	`+ return $this->renderer->renderBlock($view, 'form_start', $vars);`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`protected function renderEnd(FormView $view, array $vars = [])`
`377`	`377`	`{`
`378`		`- return (string) $this->renderer->renderBlock($view, 'form_end', $vars);`
	`378`	`+ return $this->renderer->renderBlock($view, 'form_end', $vars);`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ public function testLabelHtmlIsTrue()`
`217`	`217`
`218`	`218`	`protected function renderForm(FormView $view, array $vars = [])`
`219`	`219`	`{`
`220`		`- return (string) $this->renderer->renderBlock($view, 'form', $vars);`
	`220`	`+ return $this->renderer->renderBlock($view, 'form', $vars);`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`protected function renderLabel(FormView $view, $label = null, array $vars = [])`
`@@ -226,42 +226,42 @@ protected function renderLabel(FormView $view, $label = null, array $vars = [])`
`226`	`226`	`$vars += ['label' => $label];`
`227`	`227`	`}`
`228`	`228`
`229`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
	`229`	`+ return $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`protected function renderHelp(FormView $view)`
`233`	`233`	`{`
`234`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'help');`
	`234`	`+ return $this->renderer->searchAndRenderBlock($view, 'help');`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`protected function renderErrors(FormView $view)`
`238`	`238`	`{`
`239`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'errors');`
	`239`	`+ return $this->renderer->searchAndRenderBlock($view, 'errors');`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`protected function renderWidget(FormView $view, array $vars = [])`
`243`	`243`	`{`
`244`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
	`244`	`+ return $this->renderer->searchAndRenderBlock($view, 'widget', $vars);`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`protected function renderRow(FormView $view, array $vars = [])`
`248`	`248`	`{`
`249`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
	`249`	`+ return $this->renderer->searchAndRenderBlock($view, 'row', $vars);`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`protected function renderRest(FormView $view, array $vars = [])`
`253`	`253`	`{`
`254`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
	`254`	`+ return $this->renderer->searchAndRenderBlock($view, 'rest', $vars);`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`protected function renderStart(FormView $view, array $vars = [])`
`258`	`258`	`{`
`259`		`- return (string) $this->renderer->renderBlock($view, 'form_start', $vars);`
	`259`	`+ return $this->renderer->renderBlock($view, 'form_start', $vars);`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`protected function renderEnd(FormView $view, array $vars = [])`
`263`	`263`	`{`
`264`		`- return (string) $this->renderer->renderBlock($view, 'form_end', $vars);`
	`264`	`+ return $this->renderer->renderBlock($view, 'form_end', $vars);`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`protected function setTheme(FormView $view, array $themes, $useDefaultThemes = true)`