[Form] Turned Twig filters into tests

webmozart · webmozart · commit 921681658c55 · 2012-07-21T17:26:50.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -80,8 +80,16 @@ public function getFilters()
     {
         return array(
             'humanize'           => new \Twig_Filter_Method($this, 'renderer->humanize'),
-            'is_choice_group'    => new \Twig_Filter_Function('is_array', array('is_safe' => array('html'))),
-            'is_choice_selected' => new \Twig_Filter_Method($this, 'isChoiceSelected'),
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTests()
+    {
+        return array(
+            'selectedchoice' => new \Twig_Test_Method($this, 'isSelectedChoice'),
         );
     }
 
@@ -108,7 +116,7 @@ public function getFilters()
      *
      * @see ChoiceView::isSelected()
      */
-    public function isChoiceSelected(ChoiceView $choice, $selectedValue)
+    public function isSelectedChoice(ChoiceView $choice, $selectedValue)
     {
         if (is_array($selectedValue)) {
             return false !== array_search($choice->value, $selectedValue, true);
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -87,13 +87,13 @@
 {% block choice_widget_options %}
 {% spaceless %}
     {% for group_label, choice in options %}
-        {% if choice|is_choice_group %}
+        {% if choice is iterable %}
             <optgroup label="{{ group_label|trans({}, translation_domain) }}">
                 {% set options = choice %}
                 {{ block('choice_widget_options') }}
             </optgroup>
         {% else %}
-            <option value="{{ choice.value }}"{% if choice|is_choice_selected(value) %} selected="selected"{% endif %}>{{ choice.label|trans({}, translation_domain) }}</option>
+            <option value="{{ choice.value }}"{% if choice is selectedchoice(value) %} selected="selected"{% endif %}>{{ choice.label|trans({}, translation_domain) }}</option>
         {% endif %}
     {% endfor %}
 {% endspaceless %}
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -106,7 +106,7 @@ public function testThemeBlockInheritanceUsingExtend()
         );
     }
 
-    public function isChoiceSelectedProvider()
+    public function isSelectedChoiceProvider()
     {
         // The commented cases should not be necessary anymore, because the
         // choice lists should assure that both values passed here are always
@@ -130,13 +130,13 @@ public function isChoiceSelectedProvider()
     }
 
     /**
-     * @dataProvider isChoiceSelectedProvider
+     * @dataProvider isSelectedChoiceProvider
      */
     public function testIsChoiceSelected($expected, $choice, $value)
     {
         $choice = new ChoiceView($choice, $choice . ' label');
 
-        $this->assertSame($expected, $this->extension->isChoiceSelected($choice, $value));
+        $this->assertSame($expected, $this->extension->isSelectedChoice($choice, $value));
     }
 
     protected function renderEnctype(FormView $view)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
@@ -49,11 +49,6 @@ public function getName()
         return 'form';
     }
 
-    public function isChoiceSelected(ChoiceView $choice, $selectedValue)
-    {
-        return $this->renderer->isChoiceSelected($choice, $selectedValue);
-    }
-
     /**
      * Sets a theme for a given view.
      *
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
@@ -113,10 +113,9 @@ CHANGELOG
  * deprecated the methods `getDefaultOptions` and `getAllowedOptionValues`
    in FormTypeInterface and FormTypeExtensionInterface
  * options passed during construction can now be accessed from FormConfigInterface
- * added FormBuilderInterface, FormView and FormConfigEditorInterface
- * [BC BREAK] the methods in FormTypeInterface and FormTypeExtensionInterface now
-   receive FormBuilderInterface and FormView instead of FormBuilder and
-   FormView
+ * added FormBuilderInterface and FormConfigEditorInterface
+ * [BC BREAK] the method `buildForm` in FormTypeInterface and FormTypeExtensionInterface
+   now receives a FormBuilderInterface instead of a FormBuilder instance
  * [BC BREAK] the method `buildViewBottomUp` was renamed to `finishView` in
    FormTypeInterface and FormTypeExtensionInterface
  * [BC BREAK] the options array is now passed as last argument of the

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function testThemeBlockInheritanceUsingExtend()`
`106`	`106`	`);`
`107`	`107`	`}`
`108`	`108`
`109`		`- public function isChoiceSelectedProvider()`
	`109`	`+ public function isSelectedChoiceProvider()`
`110`	`110`	`{`
`111`	`111`	`// The commented cases should not be necessary anymore, because the`
`112`	`112`	`// choice lists should assure that both values passed here are always`
`@@ -130,13 +130,13 @@ public function isChoiceSelectedProvider()`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`/**`
`133`		`- * @dataProvider isChoiceSelectedProvider`
	`133`	`+ * @dataProvider isSelectedChoiceProvider`
`134`	`134`	`*/`
`135`	`135`	`public function testIsChoiceSelected($expected, $choice, $value)`
`136`	`136`	`{`
`137`	`137`	`$choice = new ChoiceView($choice, $choice . ' label');`
`138`	`138`
`139`		`- $this->assertSame($expected, $this->extension->isChoiceSelected($choice, $value));`
	`139`	`+ $this->assertSame($expected, $this->extension->isSelectedChoice($choice, $value));`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`protected function renderEnctype(FormView $view)`
Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,6 @@ public function getName()`
`49`	`49`	`return 'form';`
`50`	`50`	`}`
`51`	`51`
`52`		`- public function isChoiceSelected(ChoiceView $choice, $selectedValue)`
`53`		`- {`
`54`		`- return $this->renderer->isChoiceSelected($choice, $selectedValue);`
`55`		`- }`
`56`		`-`
`57`	`52`	`/**`
`58`	`53`	`* Sets a theme for a given view.`
`59`	`54`	`*`