Remove vars option from form_help

Mathieu Piot · mpiot · commit 6ea7a2054b39 · 2018-03-23T15:53:02.000+01:00
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
@@ -69,9 +69,9 @@ protected function renderLabel(FormView $view, $label = null, array $vars = arra
         return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
     }
 
-    protected function renderHelp(FormView $view, array $vars = array())
+    protected function renderHelp(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'help', $vars);
+        return (string) $this->renderer->searchAndRenderBlock($view, 'help');
     }
 
     protected function renderErrors(FormView $view)
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
@@ -89,9 +89,9 @@ protected function renderLabel(FormView $view, $label = null, array $vars = arra
         return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
     }
 
-    protected function renderHelp(FormView $view, array $vars = array())
+    protected function renderHelp(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'help', $vars);
+        return (string) $this->renderer->searchAndRenderBlock($view, 'help');
     }
 
     protected function renderErrors(FormView $view)
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
@@ -70,9 +70,9 @@ protected function renderLabel(FormView $view, $label = null, array $vars = arra
         return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
     }
 
-    protected function renderHelp(FormView $view, array $vars = array())
+    protected function renderHelp(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'help', $vars);
+        return (string) $this->renderer->searchAndRenderBlock($view, 'help');
     }
 
     protected function renderErrors(FormView $view)
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
@@ -92,9 +92,9 @@ protected function renderLabel(FormView $view, $label = null, array $vars = arra
         return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
     }
 
-    protected function renderHelp(FormView $view, array $vars = array())
+    protected function renderHelp(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'help', $vars);
+        return (string) $this->renderer->searchAndRenderBlock($view, 'help');
     }
 
     protected function renderErrors(FormView $view)
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -179,9 +179,9 @@ protected function renderLabel(FormView $view, $label = null, array $vars = arra
         return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
     }
 
-    protected function renderHelp(FormView $view, array $vars = array())
+    protected function renderHelp(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'help', $vars);
+        return (string) $this->renderer->searchAndRenderBlock($view, 'help');
     }
 
     protected function renderErrors(FormView $view)
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
@@ -90,9 +90,9 @@ protected function renderLabel(FormView $view, $label = null, array $vars = arra
         return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);
     }
 
-    protected function renderHelp(FormView $view, array $vars = array())
+    protected function renderHelp(FormView $view)
     {
-        return (string) $this->renderer->searchAndRenderBlock($view, 'help', $vars);
+        return (string) $this->renderer->searchAndRenderBlock($view, 'help');
     }
 
     protected function renderErrors(FormView $view)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
@@ -173,13 +173,12 @@ public function label(FormView $view, $label = null, array $variables = array())
      * Renders the help of the given view.
      *
      * @param FormView $view      The parent view
-     * @param array    $variables An array of variables
      *
      * @return string The HTML markup
      */
-    public function help(FormView $view, array $variables = array())
+    public function help(FormView $view)
     {
-        return $this->renderer->searchAndRenderBlock($view, 'help', $variables);
+        return $this->renderer->searchAndRenderBlock($view, 'help');
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
@@ -91,7 +91,7 @@ protected function renderLabel(FormView $view, $label = null, array $vars = arra
         return (string) $this->engine->get('form')->label($view, $label, $vars);
     }
 
-    protected function renderHelp(FormView $view, array $vars = array())
+    protected function renderHelp(FormView $view)
     {
         return (string) $this->engine->get('form')->help($view);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
@@ -92,7 +92,7 @@ protected function renderLabel(FormView $view, $label = null, array $vars = arra
         return (string) $this->engine->get('form')->label($view, $label, $vars);
     }
 
-    protected function renderHelp(FormView $view, array $vars = array())
+    protected function renderHelp(FormView $view)
     {
         return (string) $this->engine->get('form')->help($view);
     }
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -113,7 +113,7 @@ abstract protected function renderForm(FormView $view, array $vars = array());
 
     abstract protected function renderLabel(FormView $view, $label = null, array $vars = array());
 
-    abstract protected function renderHelp(FormView $view, array $vars = array());
+    abstract protected function renderHelp(FormView $view);
 
     abstract protected function renderErrors(FormView $view);
 

Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,9 @@ protected function renderLabel(FormView $view, $label = null, array $vars = arra`
`69`	`69`	`return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
`70`	`70`	`}`
`71`	`71`
`72`		`- protected function renderHelp(FormView $view, array $vars = array())`
	`72`	`+ protected function renderHelp(FormView $view)`
`73`	`73`	`{`
`74`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'help', $vars);`
	`74`	`+ return (string) $this->renderer->searchAndRenderBlock($view, 'help');`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`protected function renderErrors(FormView $view)`
Original file line number	Diff line number	Diff line change
`@@ -89,9 +89,9 @@ protected function renderLabel(FormView $view, $label = null, array $vars = arra`
`89`	`89`	`return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
`90`	`90`	`}`
`91`	`91`
`92`		`- protected function renderHelp(FormView $view, array $vars = array())`
	`92`	`+ protected function renderHelp(FormView $view)`
`93`	`93`	`{`
`94`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'help', $vars);`
	`94`	`+ return (string) $this->renderer->searchAndRenderBlock($view, 'help');`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`protected function renderErrors(FormView $view)`
Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,9 @@ protected function renderLabel(FormView $view, $label = null, array $vars = arra`
`70`	`70`	`return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
`71`	`71`	`}`
`72`	`72`
`73`		`- protected function renderHelp(FormView $view, array $vars = array())`
	`73`	`+ protected function renderHelp(FormView $view)`
`74`	`74`	`{`
`75`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'help', $vars);`
	`75`	`+ return (string) $this->renderer->searchAndRenderBlock($view, 'help');`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`protected function renderErrors(FormView $view)`
Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,9 @@ protected function renderLabel(FormView $view, $label = null, array $vars = arra`
`92`	`92`	`return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
`93`	`93`	`}`
`94`	`94`
`95`		`- protected function renderHelp(FormView $view, array $vars = array())`
	`95`	`+ protected function renderHelp(FormView $view)`
`96`	`96`	`{`
`97`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'help', $vars);`
	`97`	`+ return (string) $this->renderer->searchAndRenderBlock($view, 'help');`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`protected function renderErrors(FormView $view)`
Original file line number	Diff line number	Diff line change
`@@ -179,9 +179,9 @@ protected function renderLabel(FormView $view, $label = null, array $vars = arra`
`179`	`179`	`return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
`180`	`180`	`}`
`181`	`181`
`182`		`- protected function renderHelp(FormView $view, array $vars = array())`
	`182`	`+ protected function renderHelp(FormView $view)`
`183`	`183`	`{`
`184`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'help', $vars);`
	`184`	`+ return (string) $this->renderer->searchAndRenderBlock($view, 'help');`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`protected function renderErrors(FormView $view)`
Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,9 @@ protected function renderLabel(FormView $view, $label = null, array $vars = arra`
`90`	`90`	`return (string) $this->renderer->searchAndRenderBlock($view, 'label', $vars);`
`91`	`91`	`}`
`92`	`92`
`93`		`- protected function renderHelp(FormView $view, array $vars = array())`
	`93`	`+ protected function renderHelp(FormView $view)`
`94`	`94`	`{`
`95`		`- return (string) $this->renderer->searchAndRenderBlock($view, 'help', $vars);`
	`95`	`+ return (string) $this->renderer->searchAndRenderBlock($view, 'help');`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`protected function renderErrors(FormView $view)`
Original file line number	Diff line number	Diff line change
`@@ -173,13 +173,12 @@ public function label(FormView $view, $label = null, array $variables = array())`
`173`	`173`	`* Renders the help of the given view.`
`174`	`174`	`*`
`175`	`175`	`* @param FormView $view The parent view`
`176`		`- * @param array $variables An array of variables`
`177`	`176`	`*`
`178`	`177`	`* @return string The HTML markup`
`179`	`178`	`*/`
`180`		`- public function help(FormView $view, array $variables = array())`
	`179`	`+ public function help(FormView $view)`
`181`	`180`	`{`
`182`		`- return $this->renderer->searchAndRenderBlock($view, 'help', $variables);`
	`181`	`+ return $this->renderer->searchAndRenderBlock($view, 'help');`
`183`	`182`	`}`
`184`	`183`
`185`	`184`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ protected function renderLabel(FormView $view, $label = null, array $vars = arra`
`91`	`91`	`return (string) $this->engine->get('form')->label($view, $label, $vars);`
`92`	`92`	`}`
`93`	`93`
`94`		`- protected function renderHelp(FormView $view, array $vars = array())`
	`94`	`+ protected function renderHelp(FormView $view)`
`95`	`95`	`{`
`96`	`96`	`return (string) $this->engine->get('form')->help($view);`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ protected function renderLabel(FormView $view, $label = null, array $vars = arra`
`92`	`92`	`return (string) $this->engine->get('form')->label($view, $label, $vars);`
`93`	`93`	`}`
`94`	`94`
`95`		`- protected function renderHelp(FormView $view, array $vars = array())`
	`95`	`+ protected function renderHelp(FormView $view)`
`96`	`96`	`{`
`97`	`97`	`return (string) $this->engine->get('form')->help($view);`
`98`	`98`	`}`