Merge branch '3.3' into 3.4

* 3.3:
  moved method to function
  marked method as being internal

Author: fabpot

src/Symfony/Bridge/Twig/Extension/FormExtension.php

@@ -106,7 +106,7 @@ public function getTests()
     {
         return array(
             new TwigTest('selectedchoice', 'Symfony\Bridge\Twig\Extension\twig_is_selected_choice'),
-            new TwigTest('rootform', array($this, 'isRootForm')),
+            new TwigTest('rootform', 'Symfony\Bridge\Twig\Extension\twig_is_root_form'),
         );
     }
 
@@ -166,11 +166,6 @@ public function __unset($name)
         unset($this->$name);
     }
 
-    public function isRootForm(FormView $formView)
-    {
-        return null === $formView->parent;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -199,3 +194,11 @@ function twig_is_selected_choice(ChoiceView $choice, $selectedValue)
 
     return $choice->value === $selectedValue;
 }
+
+/**
+ * @internal
+ */
+function twig_is_root_form(FormView $formView)
+{
+    return null === $formView->parent;
+}