Check class, trait, interface naming in lowercase, change error codes to Missing, add Found info

Author: annechko

src/Standards/Generic/Sniffs/NamingConventions/AbstractPrefixRequiredForAbstractClassSniff.php

@@ -38,8 +38,7 @@ public function register()
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($prev === false || $phpcsFile->getTokens()[$prev]['code'] !== T_ABSTRACT) {
+        if ($phpcsFile->getClassProperties($stackPtr)['is_abstract'] === false) {
             // This class is not abstract so we don't need to check it.
             return;
         }
@@ -51,8 +50,8 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         $prefix = substr($className, 0, 8);
-        if ($prefix !== 'Abstract') {
-            $phpcsFile->addError('Abstract classes MUST be prefixed by Abstract: e.g. Psr\Foo\AbstractBar.', $stackPtr, 'RequiredAbstractPrefix');
+        if (strtolower($prefix) !== 'abstract') {
+            $phpcsFile->addError('Abstract classes MUST be prefixed by Abstract: e.g. AbstractBar. Found: %s', $stackPtr, 'Missing', [$className]);
         }
 
     }//end process()

src/Standards/Generic/Sniffs/NamingConventions/InterfaceSuffixRequiredForInterfaceSniff.php

@@ -43,10 +43,9 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        $interfaceNameLength = strlen($interfaceName);
-        $suffix = substr($interfaceName, ($interfaceNameLength - 9), $interfaceNameLength);
-        if ($suffix !== 'Interface') {
-            $phpcsFile->addError('Interfaces MUST be suffixed by Interface: e.g. Psr\Foo\BarInterface.', $stackPtr, 'RequiredInterfaceSuffix');
+        $suffix = substr($interfaceName, - 9);
+        if (strtolower($suffix) !== 'interface') {
+            $phpcsFile->addError('Interfaces MUST be suffixed by Interface: e.g. BarInterface. Found: %s', $stackPtr, 'Missing', [$interfaceName]);
         }
 
     }//end process()

src/Standards/Generic/Sniffs/NamingConventions/TraitSuffixRequiredForTraitSniff.php

@@ -43,10 +43,9 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        $traitNameLength = strlen($traitName);
-        $suffix          = substr($traitName, ($traitNameLength - 5), $traitNameLength);
-        if ($suffix !== 'Trait') {
-            $phpcsFile->addError('Traits MUST be suffixed by Trait: e.g. Psr\Foo\BarTrait.', $stackPtr, 'RequiredTraitSuffix');
+        $suffix = substr($traitName, - 5);
+        if (strtolower($suffix) !== 'trait') {
+            $phpcsFile->addError('Traits MUST be suffixed by Trait: e.g. BarTrait. Found: %s', $stackPtr, 'Missing', [$traitName]);
         }
 
     }//end process()

src/Standards/Generic/Tests/NamingConventions/AbstractPrefixRequiredForAbstractClassUnitTest.inc

@@ -51,4 +51,9 @@ $var = 'abstract class IncorrectNameButOk';
 
 $abstracVar = '';
 
-class NameAbstractBar {}
+class NameAbstractBar {}
+
+abstract class abstractOkName
+{
+
+}

src/Standards/Generic/Tests/NamingConventions/InterfaceSuffixRequiredForInterfaceUnitTest.inc

@@ -16,7 +16,7 @@ interface ISomeNameInterface
 }
 
 
-interface ISomeOtherNameinterface // error
+interface ISomeOtherNameinterface
 {
 
 }

src/Standards/Generic/Tests/NamingConventions/InterfaceSuffixRequiredForInterfaceUnitTest.php

@@ -24,10 +24,7 @@ class InterfaceSuffixRequiredForInterfaceUnitTest extends AbstractSniffUnitTest
      */
     public function getErrorList()
     {
-        return [
-            8  => 1,
-            19 => 1,
-        ];
+        return [8 => 1];
 
     }//end getErrorList()
 

src/Standards/Generic/Tests/NamingConventions/TraitSuffixRequiredForTraitUnitTest.inc

@@ -8,6 +8,6 @@ trait GoodTraitTrait {}
 
 trait BadTraitName {} // error
 
-trait BadTraitNametrait {} // error
+trait BadTraitNametrait {}
 
 trait NormalTraitNameTrait {}

src/Standards/Generic/Tests/NamingConventions/TraitSuffixRequiredForTraitUnitTest.php

@@ -25,9 +25,8 @@ class TraitSuffixRequiredForTraitUnitTest extends AbstractSniffUnitTest
     public function getErrorList()
     {
         return [
-            3  => 1,
-            9  => 1,
-            11 => 1,
+            3 => 1,
+            9 => 1,
         ];
 
     }//end getErrorList()