Merge branch '2.3' into 2.6

fabpot · fabpot · commit acf459364582 · 2015-03-24T18:00:37.000+01:00
* 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
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -1235,7 +1235,7 @@ private function getDefinitionsFromArguments(array $arguments)
      *
      * @return bool
      */
-    private function hasReference($id, array $arguments, $deep = false, array $visited = array())
+    private function hasReference($id, array $arguments, $deep = false, array &$visited = array())
     {
         foreach ($arguments as $argument) {
             if (is_array($argument)) {

Original file line number	Diff line number	Diff line change
`@@ -1235,7 +1235,7 @@ private function getDefinitionsFromArguments(array $arguments)`
`1235`	`1235`	`*`
`1236`	`1236`	`* @return bool`
`1237`	`1237`	`*/`
`1238`		`- private function hasReference($id, array $arguments, $deep = false, array $visited = array())`
	`1238`	`+ private function hasReference($id, array $arguments, $deep = false, array &$visited = array())`
`1239`	`1239`	`{`
`1240`	`1240`	`foreach ($arguments as $argument) {`
`1241`	`1241`	`if (is_array($argument)) {`