Merge branch '1.12'

Conflicts:
	Symfony/CS/AbstractAnnotationRemovalFixer.php
	Symfony/CS/Fixer/Contrib/AlignEqualsFixer.php
	Symfony/CS/Fixer/Contrib/NoBlankLinesBeforeNamespaceFixer.php
	Symfony/CS/Fixer/Contrib/PhpdocVarToTypeFixer.php
	Symfony/CS/Fixer/Symfony/PhpdocTypeToVarFixer.php
	src/AbstractLinesBeforeNamespaceFixer.php
	src/AbstractPhpdocTypesFixer.php
	src/Fixer/Phpdoc/PhpdocNoAccessFixer.php
	src/Fixer/Phpdoc/PhpdocNoPackageFixer.php
	tests/DocBlock/AnnotationTest.php
	tests/DocBlock/DocBlockTest.php
	tests/DocBlock/LineTest.php
	tests/DocBlock/TagComparatorTest.php
	tests/DocBlock/TagTest.php
	tests/Fixer/ArrayNotation/NoMultilineWhitespaceAroundDoubleArrowFixerTest.php
	tests/Fixer/NamespaceNotation/NoBlankLinesBeforeNamespaceFixerTest.php
	tests/Fixer/NamespaceNotation/SingleBlankLineBeforeNamespaceFixerTest.php
	tests/Fixer/Phpdoc/NoBlankLinesAfterPhpdocFixerTest.php
	tests/Fixer/Phpdoc/PhpdocNoAccessFixerTest.php
	tests/Fixer/Phpdoc/PhpdocNoEmptyReturnFixerTest.php
	tests/Fixer/Phpdoc/PhpdocNoPackageFixerTest.php
	tests/Fixer/Phpdoc/PhpdocOrderFixerTest.php
	tests/Fixer/Phpdoc/PhpdocScalarFixerTest.php
	tests/Fixer/Phpdoc/PhpdocSeparationFixerTest.php
	tests/Fixer/Phpdoc/PhpdocSummaryFixerTest.php
	tests/Fixer/Phpdoc/PhpdocTrimFixerTest.php
	tests/Fixer/Phpdoc/PhpdocTypesFixerTest.php
	tests/Fixer/Phpdoc/PhpdocVarWithoutNameFixerTest.php
	tests/Fixer/ReturnNotation/SimplifiedNullReturnFixerTest.php

src/AbstractLinesBeforeNamespaceFixer.php

@@ -18,7 +18,7 @@ use PhpCsFixer\Tokenizer\Tokens;
  * This abstract fixer is responsible for ensuring that a certain number of
  * lines prefix a namespace declaration.
  *
- * @author Graham Campbell <graham@mineuk.com>
+ * @author Graham Campbell <graham@alt-three.com>
  *
  * @internal
  */

src/AbstractPhpdocTypesFixer.php

@@ -19,7 +19,7 @@ use PhpCsFixer\Tokenizer\Tokens;
 /**
  * This abstract fixer provides a base for fixers to fix types in phpdoc.
  *
- * @author Graham Campbell <graham@mineuk.com>
+ * @author Graham Campbell <graham@alt-three.com>
  *
  * @internal
  */

src/AbstractPsrFixer.php

@@ -19,7 +19,7 @@ use PhpCsFixer\Tokenizer\Tokens;
  * @author Jordi Boggiano <j.boggiano@seld.be>
  * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
  * @author Bram Gotink <bram@gotink.me>
- * @author Graham Campbell <graham@mineuk.com>
+ * @author Graham Campbell <graham@alt-three.com>
  */
 abstract class AbstractPsrFixer extends AbstractFixer
 {

src/DocBlock/Annotation.php

@@ -15,7 +15,7 @@ namespace PhpCsFixer\DocBlock;
 /**
  * This represents an entire annotation from a docblock.
  *
- * @author Graham Campbell <graham@mineuk.com>
+ * @author Graham Campbell <graham@alt-three.com>
  */
 class Annotation
 {

src/DocBlock/DocBlock.php

@@ -19,7 +19,7 @@ use PhpCsFixer\Utils;
  *
  * It internally splits it up into "lines" that we can manipulate.
  *
- * @author Graham Campbell <graham@mineuk.com>
+ * @author Graham Campbell <graham@alt-three.com>
  */
 class DocBlock
 {

src/DocBlock/Line.php

@@ -15,7 +15,7 @@ namespace PhpCsFixer\DocBlock;
 /**
  * This represents a line of a docblock.
  *
- * @author Graham Campbell <graham@mineuk.com>
+ * @author Graham Campbell <graham@alt-three.com>
  */
 class Line
 {

src/DocBlock/Tag.php

@@ -15,7 +15,7 @@ namespace PhpCsFixer\DocBlock;
 /**
  * This represents a tag, as defined by the proposed PSR PHPDoc standard.
  *
- * @author Graham Campbell <graham@mineuk.com>
+ * @author Graham Campbell <graham@alt-three.com>
  */
 class Tag
 {

src/DocBlock/TagComparator.php

@@ -16,7 +16,7 @@ namespace PhpCsFixer\DocBlock;
  * This class is responsible for comparing tags to see if they should be kept
  * together, or kept apart.
  *
- * @author Graham Campbell <graham@mineuk.com>
+ * @author Graham Campbell <graham@alt-three.com>
  */
 class TagComparator
 {

src/Fixer/ArrayNotation/AlignDoubleArrowFixer.php

@@ -18,7 +18,7 @@ use PhpCsFixer\Tokenizer\Tokens;
 /**
  * @author Carlos Cirello <carlos.cirello.nl@gmail.com>
  * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
- * @author Graham Campbell <graham@mineuk.com>
+ * @author Graham Campbell <graham@alt-three.com>
  */
 final class AlignDoubleArrowFixer extends AbstractAlignFixer
 {

src/Fixer/ArrayNotation/NoMultilineWhitespaceAroundDoubleArrowFixer.php

@@ -19,7 +19,7 @@ use PhpCsFixer\Tokenizer\Tokens;
 /**
  * @author Carlos Cirello <carlos.cirello.nl@gmail.com>
  * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
- * @author Graham Campbell <graham@mineuk.com>
+ * @author Graham Campbell <graham@alt-three.com>
  */
 final class NoMultilineWhitespaceAroundDoubleArrowFixer extends AbstractFixer
 {