Merge branch '3.1' into 3.2

nicolas-grekas · nicolas-grekas · commit c6b6111f5aae · 2016-11-25T13:32:42.000+01:00
* 3.1:
  [Routing] Fail properly when a route parameter name cannot be used as a PCRE subpattern name
  [FrameworkBundle] Improve performance of ControllerNameParser
  Update documentation link to the component
  [HttpFoundation] Add links to RFC-7231
  [DI] Initialize properties before method calls
  Tag missing internals
  [WebProfilerBundle] Dont use request attributes in RouterController
  Fix complete config tests
diff --git a/Field/ChoiceFormField.php b/Field/ChoiceFormField.php
@@ -155,11 +155,11 @@ public function setValue($value)
     /**
      * Adds a choice to the current ones.
      *
-     * This method should only be used internally.
-     *
      * @param \DOMElement $node
      *
      * @throws \LogicException When choice provided is not multiple nor radio
+     *
+     * @internal
      */
     public function addChoice(\DOMElement $node)
     {

Original file line number	Diff line number	Diff line change
`@@ -155,11 +155,11 @@ public function setValue($value)`
`155`	`155`	`/**`
`156`	`156`	`* Adds a choice to the current ones.`
`157`	`157`	`*`
`158`		`- * This method should only be used internally.`
`159`		`- *`
`160`	`158`	`* @param \DOMElement $node`
`161`	`159`	`*`
`162`	`160`	`* @throws \LogicException When choice provided is not multiple nor radio`
	`161`	`+ *`
	`162`	`+ * @internal`
`163`	`163`	`*/`
`164`	`164`	`public function addChoice(\DOMElement $node)`
`165`	`165`	`{`