Allow one interface name be in new line

Author: michalbundyra

src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php

@@ -245,27 +245,14 @@ public function processOpen(File $phpcsFile, $stackPtr)
             $nextClass    = $phpcsFile->findNext($find, ($nextClass + 1), ($openingBrace - 1));
         }
 
-        $skip = array_merge(
-            Tokens::$emptyTokens,
-            [
-                T_STRING,
-                T_NS_SEPARATOR,
-            ]
-        );
-
         $classCount         = count($classNames);
         $checkingImplements = false;
         $implementsToken    = null;
-        $oneInterface       = false;
         foreach ($classNames as $n => $className) {
             if ($tokens[$className]['code'] === $keywordTokenType) {
                 $checkingImplements = true;
                 $implementsToken    = $className;
 
-                if (false === $phpcsFile->findNext($skip, ($implementsToken + 1), ($openingBrace - 1), true)) {
-                    $oneInterface = true;
-                }
-
                 continue;
             }
 
@@ -328,39 +315,6 @@ public function processOpen(File $phpcsFile, $stackPtr)
                         $phpcsFile->fixer->addNewline($prev);
                         $phpcsFile->fixer->endChangeset();
                     }
-                } else if ($oneInterface === true) {
-                    if ($tokens[$implementsToken]['line'] !== $tokens[$className]['line']) {
-                        $error = 'Interface name should be in the same line as '.$keywordType.' keyword';
-                        $fix   = $phpcsFile->addFixableError($error, $className, 'InterfaceWrongLine');
-                        if ($fix === true) {
-                            $phpcsFile->fixer->beginChangeset();
-                            $comments = [];
-
-                            for ($i = ($implementsToken + 1); $i < $className; ++$i) {
-                                if ($tokens[$i]['code'] === T_COMMENT) {
-                                    $comments[] = trim($tokens[$i]['content']);
-                                }
-
-                                if ($tokens[$i]['code'] === T_WHITESPACE
-                                    || $tokens[$i]['code'] === T_COMMENT
-                                ) {
-                                    $phpcsFile->fixer->replaceToken($i, '');
-                                }
-                            }
-
-                            $phpcsFile->fixer->addContent($implementsToken, ' ');
-                            if (empty($comments) === false) {
-                                $i = $className;
-                                while ($tokens[($i + 1)]['line'] === $tokens[$className]['line']) {
-                                    ++$i;
-                                }
-
-                                $phpcsFile->fixer->addContentBefore($i, ' '.implode(' ', $comments));
-                            }
-
-                            $phpcsFile->fixer->endChangeset();
-                        }//end if
-                    }//end if
                 } else {
                     $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($className - 1), $implements);
                     if ($tokens[$prev]['line'] !== $tokens[$className]['line']) {
@@ -371,7 +325,7 @@ public function processOpen(File $phpcsFile, $stackPtr)
 
                     $expected = ($classIndent + $this->indent);
                     if ($found !== $expected) {
-                        $error = 'Expected %s spaces before interface name; %s found - '.$n.' :: '.$classCount;
+                        $error = 'Expected %s spaces before interface name; %s found';
                         $data  = [
                             $expected,
                             $found,

src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.inc.fixed

@@ -162,11 +162,13 @@ class C2
 
 } // phpcs:ignore Standard.Category.Sniff
 
-interface I1 extends Foo
+interface I1 extends
+    Foo
 {
 }
 
-interface I2 extends Bar
+interface I2 extends
+    Bar
 {
 }
 
@@ -184,11 +186,13 @@ class C2 extends Bar
 {
 }
 
-class C3 extends Foo implements Bar
+class C3 extends Foo implements
+    Bar
 {
 }
 
-class C4 extends Foo implements Bar
+class C4 extends Foo implements
+    Bar
 {
 }
 
@@ -198,22 +202,27 @@ class C5 extends Foo implements
 {
 }
 
-class C6 extends \Foo\Bar implements \Baz\Bar
+class C6 extends \Foo\Bar implements
+    \Baz\Bar
 {
 }
 
-interface I4 extends \Baz\Bar
+interface I4 extends
+    \Baz\Bar
 {
 }
 
-interface I5 extends \Foo\Bar /* comment */
+interface I5 extends /* comment */
+    \Foo\Bar
 {
 }
 
-interface I6 extends \Foo\Bar // comment
+interface I6 extends // comment
+    \Foo\Bar
 {
 }
 
-class C7 extends \Foo\Bar implements \Baz\Bar // comment
+class C7 extends \Foo\Bar implements // comment
+    \Baz\Bar
 {
 }

src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php

@@ -51,20 +51,16 @@ public function getErrorList()
             131 => 1,
             158 => 1,
             168 => 1,
-            173 => 1,
             178 => 1,
             179 => 1,
             184 => 1,
             189 => 1,
             194 => 1,
-            199 => 1,
             204 => 1,
             205 => 1,
             210 => 1,
             215 => 2,
             216 => 1,
-            221 => 1,
-            226 => 1,
             231 => 2,
         ];