Merge branch '2.7' into 2.8

fabpot · fabpot · commit 4dccfefb7c0f · 2017-12-04T10:21:19.000-08:00
* 2.7:
  marked method as being internal
diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -158,6 +158,9 @@ public function isSelectedChoice(ChoiceView $choice, $selectedValue)
         return $choice->value === $selectedValue;
     }
 
+    /**
+     * @internal
+     */
     public function isRootForm(FormView $formView)
     {
         return null === $formView->parent;

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,9 @@ public function isSelectedChoice(ChoiceView $choice, $selectedValue)`
`158`	`158`	`return $choice->value === $selectedValue;`
`159`	`159`	`}`
`160`	`160`
	`161`	`+ /**`
	`162`	`+ * @internal`
	`163`	`+ */`
`161`	`164`	`public function isRootForm(FormView $formView)`
`162`	`165`	`{`
`163`	`166`	`return null === $formView->parent;`