Psr0Fixer - class with anonymous class

PHP-CS-Fixer · Jan 2, 2019 · e28c9e4 · e28c9e4
1 parent 4537bfd
commit e28c9e4
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/src/Fixer/Basic/Psr0Fixer.php b/src/Fixer/Basic/Psr0Fixer.php
@@ -81,12 +81,12 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
 
                 $namespace = trim($tokens->generatePartialCode($namespaceIndex, $namespaceEndIndex - 1));
             } elseif ($token->isClassy()) {
-                if (null !== $classyName) {
-                    return;
-                }
-
                 $prevToken = $tokens[$tokens->getPrevMeaningfulToken($index)];
                 if ($prevToken->isGivenKind(T_NEW)) {
+                    break;
+                }
+
+                if (null !== $classyName) {
                     return;
                 }
 

diff --git a/tests/Fixer/Basic/Psr0FixerTest.php b/tests/Fixer/Basic/Psr0FixerTest.php
@@ -191,6 +191,35 @@ class Psr0Fixer {}
         $this->doTest($expected, null, $file);
     }
 
+    /**
+     * @requires PHP 7.0
+     */
+    public function testClassWithAnonymousClass()
+    {
+        $file = $this->getTestFile(__FILE__);
+
+        $expected = <<<'EOF'
+<?php
+namespace PhpCsFixer\Tests\Fixer\Basic;
+class Psr0FixerTest {
+    public function foo() {
+        return new class() implements FooInterface {};
+    }
+}
+EOF;
+        $input = <<<'EOF'
+<?php
+namespace PhpCsFixer\Tests\Fixer\Basic;
+class stdClass {
+    public function foo() {
+        return new class() implements FooInterface {};
+    }
+}
+EOF;
+
+        $this->doTest($expected, $input, $file);
+    }
+
     /**
      * @requires PHP 7.0
      */