Merge branch '2.2'

Conflicts:
	src/Fixer/Basic/Psr0Fixer.php

src/Fixer/Basic/Psr0Fixer.php

@@ -40,14 +40,6 @@ final class Psr0Fixer extends AbstractPsrAutoloadingFixer implements Configurati
                     '<?php
 namespace PhpCsFixer\FIXER\Basic;
 class InvalidName {}
-',
-                    new \SplFileInfo(__FILE__),
-                    ['dir' => realpath(__DIR__.'/../..')]
-                ),
-                new FileSpecificCodeSample(
-                    '<?php
-namespace PhpCsFixer\FIXER\Basic;
-class InvalidName {}
 ',
                     new \SplFileInfo(__FILE__),
                     ['dir' => realpath(__DIR__.'/../..')]