Merge branch '2.13'

Author: keradus

src/Fixer/Basic/Psr4Fixer.php

@@ -66,13 +66,15 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
             } elseif ($token->isClassy()) {
                 $prevToken = $tokens[$tokens->getPrevMeaningfulToken($index)];
                 if ($prevToken->isGivenKind(T_NEW)) {
+                    break;
+                }
+
+                if (null !== $classyName) {
                     return;
                 }
 
                 $classyIndex = $tokens->getNextMeaningfulToken($index);
                 $classyName = $tokens[$classyIndex]->getContent();
-
-                break;
             }
         }
 

tests/Fixer/Basic/Psr0FixerTest.php

@@ -57,6 +57,21 @@ class Psr0_fOo_bAr {}
         $this->doTest($expected, $input, $file);
     }
 
+    public function testIgnoreMultipleClassyInFile()
+    {
+        $file = $this->getTestFile(__FILE__);
+
+        $expected = <<<'EOF'
+<?php
+namespace PhpCsFixer\Tests\Fixer\Basic;
+interface SomeInterfaceToBeUsedInTests {}
+class blah {}
+/* class foo */
+EOF;
+
+        $this->doTest($expected, null, $file);
+    }
+
     public function testFixClassName()
     {
         $file = $this->getTestFile(__FILE__);

tests/Fixer/Basic/Psr4FixerTest.php

@@ -57,6 +57,21 @@ class Psr4_fOo_bAr {}
         $this->doTest($expected, $input, $file);
     }
 
+    public function testIgnoreMultipleClassyInFile()
+    {
+        $file = $this->getTestFile(__FILE__);
+
+        $expected = <<<'EOF'
+<?php
+namespace PhpCsFixer\Tests\Fixer\Basic;
+interface SomeInterfaceToBeUsedInTests {}
+class blah {}
+/* class foo */
+EOF;
+
+        $this->doTest($expected, null, $file);
+    }
+
     public function testFixClassName()
     {
         $file = $this->getTestFile(__FILE__);