Merge branch '1.12'

Conflicts:
	.php_cs
	Symfony/CS/Config/Config.php
	Symfony/CS/Config/MagentoConfig.php
	Symfony/CS/Config/Symfony23Config.php
	Symfony/CS/ConfigInterface.php
	Symfony/CS/ConfigurationResolver.php
	Symfony/CS/ErrorsManager.php
	Symfony/CS/Finder/DefaultFinder.php
	Symfony/CS/Finder/MagentoFinder.php
	Symfony/CS/Finder/Symfony23Finder.php
	Symfony/CS/Fixer.php
	Symfony/CS/Fixer/Contrib/AlignEqualsFixer.php
	Symfony/CS/Fixer/Contrib/HeaderCommentFixer.php
	Symfony/CS/Fixer/Contrib/NoBlankLinesBeforeNamespaceFixer.php
	Symfony/CS/Fixer/Contrib/PhpdocVarToTypeFixer.php
	Symfony/CS/Fixer/PSR2/LineAfterNamespaceFixer.php
	Symfony/CS/Fixer/PSR2/MethodArgumentSpaceFixer.php
	Symfony/CS/Fixer/Symfony/ConcatWithoutSpacesFixer.php
	Symfony/CS/Fixer/Symfony/ExtraEmptyLinesFixer.php
	Symfony/CS/Fixer/Symfony/JoinFunctionFixer.php
	Symfony/CS/Fixer/Symfony/NoTrailingWhitespaceInCommentFixer.php
	Symfony/CS/Fixer/Symfony/PhpdocTypeToVarFixer.php
	Symfony/CS/FixerInterface.php
	Symfony/CS/LintManager.php
	Symfony/CS/Tests/AbstractFixerTest.php
	Symfony/CS/Tests/ApplicationTest.php
	Symfony/CS/Tests/Config/ConfigTest.php
	Symfony/CS/Tests/ConfigurationResolverTest.php
	Symfony/CS/Tests/Console/ApplicationTest.php
	Symfony/CS/Tests/Finder/DefaultFinderTest.php
	Symfony/CS/Tests/Fixer/AbstractFixerTestBase.php
	Symfony/CS/Tests/Fixer/PSR2/MethodArgumentSpaceFixerTest.php
	Symfony/CS/Tests/Fixer/Symfony/ExtraEmptyLinesFixerTest.php
	Symfony/CS/Tests/Fixer/Symfony/JoinFunctionFixerTest.php
	Symfony/CS/Tests/FixerTest.php
	Symfony/CS/Tests/Tokenizer/AbstractTransformerTestBase.php
	Symfony/CS/Tests/Tokenizer/TokensTest.php
	Symfony/CS/Tests/Tokenizer/Transformer/CurlyCloseTest.php
	Symfony/CS/Tests/Tokenizer/Transformer/DollarCloseCurlyBracesTest.php
	Symfony/CS/Tests/Tokenizer/Transformer/DynamicPropBraceTest.php
	Symfony/CS/Tests/Tokenizer/Transformer/DynamicVarBraceTest.php
	Symfony/CS/Tests/Tokenizer/TransformersTest.php
	Symfony/CS/Tokenizer/Transformer/ArrayTypehint.php
	Symfony/CS/Tokenizer/Transformer/ClassConstant.php
	Symfony/CS/Tokenizer/Transformer/CurlyClose.php
	Symfony/CS/Tokenizer/Transformer/DollarCloseCurlyBraces.php
	Symfony/CS/Tokenizer/Transformer/DynamicPropBrace.php
	Symfony/CS/Tokenizer/Transformer/DynamicVarBrace.php
	src/Console/Command/FixCommand.php
	tests/ApplicationTest.php

.php_cs.dist

@@ -1,9 +1,10 @@
 <?php
 
 $header = <<<'EOF'
-This file is part of the PHP CS utility.
+This file is part of the PHP CS Fixer.
 
 (c) Fabien Potencier <fabien@symfony.com>
+    Dariusz Rumiński <dariusz.ruminski@gmail.com>
 
 This source file is subject to the MIT license that is bundled
 with this source code in the file LICENSE.

src/AbstractAlignFixer.php

@@ -1,9 +1,10 @@
 <?php
 
 /*
- * This file is part of the PHP CS utility.
+ * This file is part of the PHP CS Fixer.
  *
  * (c) Fabien Potencier <fabien@symfony.com>
+ *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
  *
  * This source file is subject to the MIT license that is bundled
  * with this source code in the file LICENSE.

src/AbstractAnnotationRemovalFixer.php

@@ -1,9 +1,10 @@
 <?php
 
 /*
- * This file is part of the PHP CS utility.
+ * This file is part of the PHP CS Fixer.
  *
  * (c) Fabien Potencier <fabien@symfony.com>
+ *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
  *
  * This source file is subject to the MIT license that is bundled
  * with this source code in the file LICENSE.

src/AbstractFixer.php

@@ -1,9 +1,10 @@
 <?php
 
 /*
- * This file is part of the PHP CS utility.
+ * This file is part of the PHP CS Fixer.
  *
  * (c) Fabien Potencier <fabien@symfony.com>
+ *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
  *
  * This source file is subject to the MIT license that is bundled
  * with this source code in the file LICENSE.

src/AbstractLinesBeforeNamespaceFixer.php

@@ -1,9 +1,10 @@
 <?php
 
 /*
- * This file is part of the PHP CS utility.
+ * This file is part of the PHP CS Fixer.
  *
  * (c) Fabien Potencier <fabien@symfony.com>
+ *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
  *
  * This source file is subject to the MIT license that is bundled
  * with this source code in the file LICENSE.

src/AbstractPhpdocTagsFixer.php

@@ -1,9 +1,10 @@
 <?php
 
 /*
- * This file is part of the PHP CS utility.
+ * This file is part of the PHP CS Fixer.
  *
  * (c) Fabien Potencier <fabien@symfony.com>
+ *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
  *
  * This source file is subject to the MIT license that is bundled
  * with this source code in the file LICENSE.

src/AbstractPhpdocTypesFixer.php

@@ -1,9 +1,10 @@
 <?php
 
 /*
- * This file is part of the PHP CS utility.
+ * This file is part of the PHP CS Fixer.
  *
  * (c) Fabien Potencier <fabien@symfony.com>
+ *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
  *
  * This source file is subject to the MIT license that is bundled
  * with this source code in the file LICENSE.

src/Config.php

@@ -1,9 +1,10 @@
 <?php
 
 /*
- * This file is part of the PHP CS utility.
+ * This file is part of the PHP CS Fixer.
  *
  * (c) Fabien Potencier <fabien@symfony.com>
+ *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
  *
  * This source file is subject to the MIT license that is bundled
  * with this source code in the file LICENSE.

src/ConfigAwareInterface.php

@@ -1,9 +1,10 @@
 <?php
 
 /*
- * This file is part of the PHP CS utility.
+ * This file is part of the PHP CS Fixer.
  *
  * (c) Fabien Potencier <fabien@symfony.com>
+ *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
  *
  * This source file is subject to the MIT license that is bundled
  * with this source code in the file LICENSE.

src/ConfigInterface.php

@@ -1,9 +1,10 @@
 <?php
 
 /*
- * This file is part of the PHP CS utility.
+ * This file is part of the PHP CS Fixer.
  *
  * (c) Fabien Potencier <fabien@symfony.com>
+ *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
  *
  * This source file is subject to the MIT license that is bundled
  * with this source code in the file LICENSE.