Merge branch '2.6' into 2.7

fabpot · fabpot · commit 2cf8dac5fc70 · 2015-03-24T18:00:58.000+01:00
* 2.6:
  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
  [FrameworkBundle][debug:config] added support for dynamic configurations.
  [WebProfiler] Fix partial search on url in list

Conflicts:
	src/Symfony/Bridge/Propel1/Form/EventListener/TranslationCollectionFormListener.php
	src/Symfony/Bridge/Propel1/Form/EventListener/TranslationFormListener.php
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -1241,7 +1241,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
`@@ -1241,7 +1241,7 @@ private function getDefinitionsFromArguments(array $arguments)`
`1241`	`1241`	`*`
`1242`	`1242`	`* @return bool`
`1243`	`1243`	`*/`
`1244`		`- private function hasReference($id, array $arguments, $deep = false, array $visited = array())`
	`1244`	`+ private function hasReference($id, array $arguments, $deep = false, array &$visited = array())`
`1245`	`1245`	`{`
`1246`	`1246`	`foreach ($arguments as $argument) {`
`1247`	`1247`	`if (is_array($argument)) {`