Merge branch '3.2' into 3.3

fabpot · fabpot · commit 3bbfe51cc876 · 2017-07-19T11:37:49.000+02:00
* 3.2:
  [Security] added more tests
  [Security] fixed default target path when referer contains a query string
  [Security] simplified tests
  [Security] refactored tests
  [FrameworkBundle] fix ValidatorCacheWarmer: use serializing ArrayAdapter
  Change "this" to "that" to avoid confusion
  [VarDumper] Move locale sniffing to dump() time
diff --git a/Compiler/PriorityTaggedServiceTrait.php b/Compiler/PriorityTaggedServiceTrait.php
@@ -26,7 +26,7 @@ trait PriorityTaggedServiceTrait
      *
      * The order of additions must be respected for services having the same priority,
      * and knowing that the \SplPriorityQueue class does not respect the FIFO method,
-     * we should not use this class.
+     * we should not use that class.
      *
      * @see https://bugs.php.net/bug.php?id=53710
      * @see https://bugs.php.net/bug.php?id=60926

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ trait PriorityTaggedServiceTrait`
`26`	`26`	`*`
`27`	`27`	`* The order of additions must be respected for services having the same priority,`
`28`	`28`	`* and knowing that the \SplPriorityQueue class does not respect the FIFO method,`
`29`		`- * we should not use this class.`
	`29`	`+ * we should not use that class.`
`30`	`30`	`*`
`31`	`31`	`* @see https://bugs.php.net/bug.php?id=53710`
`32`	`32`	`* @see https://bugs.php.net/bug.php?id=60926`