FrameworkBundle Tests

Mathieu Piot · mpiot · commit ba798dfdf409 · 2018-03-23T15:53:02.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_help.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_help.html.php
@@ -0,0 +1,3 @@
+<?php if (!empty($help)): ?>
+    <p class="help-text"><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($help, array(), $translation_domain) : $help) ?></p>
+<?php endif ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_row.html.php
@@ -2,4 +2,5 @@
     <?php echo $view['form']->label($form) ?>
     <?php echo $view['form']->errors($form) ?>
     <?php echo $view['form']->widget($form) ?>
+    <?php echo $view['form']->help($form); ?>
 </div>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_row.html.php
@@ -5,5 +5,6 @@
     <td>
         <?php echo $view['form']->errors($form); ?>
         <?php echo $view['form']->widget($form); ?>
+        <?php echo $view['form']->help($form); ?>
     </td>
 </tr>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
@@ -169,6 +169,19 @@ public function label(FormView $view, $label = null, array $variables = array())
         return $this->renderer->searchAndRenderBlock($view, 'label', $variables);
     }
 
+    /**
+     * 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())
+    {
+        return $this->renderer->searchAndRenderBlock($view, 'help', $variables);
+    }
+
     /**
      * Renders the errors of the given view.
      *
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
@@ -91,6 +91,11 @@ 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())
+    {
+        return (string) $this->engine->get('form')->help($view);
+    }
+
     protected function renderErrors(FormView $view)
     {
         return (string) $this->engine->get('form')->errors($view);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
@@ -92,6 +92,11 @@ 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())
+    {
+        return (string) $this->engine->get('form')->help($view);
+    }
+
     protected function renderErrors(FormView $view)
     {
         return (string) $this->engine->get('form')->errors($view);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<?php if (!empty($help)): ?>`
	`2`	`+ <p class="help-text"><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($help, array(), $translation_domain) : $help) ?></p>`
	`3`	`+<?php endif ?>`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,11 @@ 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())`
	`95`	`+ {`
	`96`	`+ return (string) $this->engine->get('form')->help($view);`
	`97`	`+ }`
	`98`	`+`
`94`	`99`	`protected function renderErrors(FormView $view)`
`95`	`100`	`{`
`96`	`101`	`return (string) $this->engine->get('form')->errors($view);`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,11 @@ 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())`
	`96`	`+ {`
	`97`	`+ return (string) $this->engine->get('form')->help($view);`
	`98`	`+ }`
	`99`	`+`
`95`	`100`	`protected function renderErrors(FormView $view)`
`96`	`101`	`{`
`97`	`102`	`return (string) $this->engine->get('form')->errors($view);`