Merge branch '2.3' into 2.6

* 2.3:
  CS: fix some license headers
  CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline
  use visited lookup with reference to gain performance
  Replace GET parameters when changed

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

Author: fabpot

Translation/PhpStringTokenParser.php

@@ -77,7 +77,7 @@ public static function parse($str)
         if ('\'' === $str[$bLength]) {
             return str_replace(
                 array('\\\\', '\\\''),
-                array(  '\\', '\''),
+                array('\\', '\''),
                 substr($str, $bLength + 1, -1)
             );
         } else {