Merge branch '2.3' into 2.6

fabpot · fabpot · commit 3d46f575d833 · 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/Extension/Core/ChoiceList/ObjectChoiceList.php b/Extension/Core/ChoiceList/ObjectChoiceList.php
@@ -2,12 +2,12 @@
 
 /*
  * This file is part of the Symfony package.
-*
-* (c) Fabien Potencier <fabien@symfony.com>
-*
-* For the full copyright and license information, please view the LICENSE
-* file that was distributed with this source code.
-*/
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace Symfony\Component\Form\Extension\Core\ChoiceList;
 
diff --git a/FormEvents.php b/FormEvents.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of the Symfony package.
  *
diff --git a/Test/TypeTestCase.php b/Test/TypeTestCase.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony package.
  *
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?php`
	`2`	`+`
`2`	`3`	`/*`
`3`	`4`	`* This file is part of the Symfony package.`
`4`	`5`	`*`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/*`
`4`	`4`	`* This file is part of the Symfony package.`
`5`	`5`	`*`
`6`		`- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>`
	`6`	`+ * (c) Fabien Potencier <[email protected]>`
`7`	`7`	`*`
`8`	`8`	`* For the full copyright and license information, please view the LICENSE`
`9`	`9`	`* file that was distributed with this source code.`