Merge branch '3.1' into 3.2

nicolas-grekas · nicolas-grekas · commit a4866cfe14de · 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/Util/OrderedHashMapIterator.php b/Util/OrderedHashMapIterator.php
@@ -14,9 +14,9 @@
 /**
  * Iterator for {@link OrderedHashMap} objects.
  *
- * This class is internal and should not be used.
- *
  * @author Bernhard Schussek <bschussek@gmail.com>
+ *
+ * @internal
  */
 class OrderedHashMapIterator implements \Iterator
 {

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@`
`14`	`14`	`/**`
`15`	`15`	`* Iterator for {@link OrderedHashMap} objects.`
`16`	`16`	`*`
`17`		`- * This class is internal and should not be used.`
`18`		`- *`
`19`	`17`	`* @author Bernhard Schussek <bschussek@gmail.com>`
	`18`	`+ *`
	`19`	`+ * @internal`
`20`	`20`	`*/`
`21`	`21`	`class OrderedHashMapIterator implements \Iterator`
`22`	`22`	`{`