Revert "Added ability to set affix type, value, case sensitive while checking Interface name, changed docs"

Author: annechko

package.xml

@@ -256,7 +256,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="AbstractPrefixRequiredForAbstractClassStandard.xml" role="php" />
         <file baseinstalldir="PHP/CodeSniffer" name="CamelCapsFunctionNameStandard.xml" role="php" />
         <file baseinstalldir="PHP/CodeSniffer" name="ConstructorNameStandard.xml" role="php" />
-        <file baseinstalldir="PHP/CodeSniffer" name="AffixRequiredForInterfaceStandard.xml" role="php" />
+        <file baseinstalldir="PHP/CodeSniffer" name="InterfaceSuffixRequiredForInterfaceStandard.xml" role="php" />
         <file baseinstalldir="PHP/CodeSniffer" name="TraitSuffixRequiredForTraitStandard.xml" role="php" />
         <file baseinstalldir="PHP/CodeSniffer" name="UpperCaseConstantNameStandard.xml" role="php" />
        </dir>
@@ -364,7 +364,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="AbstractPrefixRequiredForAbstractClassSniff.php" role="php" />
         <file baseinstalldir="PHP/CodeSniffer" name="CamelCapsFunctionNameSniff.php" role="php" />
         <file baseinstalldir="PHP/CodeSniffer" name="ConstructorNameSniff.php" role="php" />
-        <file baseinstalldir="PHP/CodeSniffer" name="AffixRequiredForInterfaceSniff.php" role="php" />
+        <file baseinstalldir="PHP/CodeSniffer" name="InterfaceSuffixRequiredForInterfaceSniff.php" role="php" />
         <file baseinstalldir="PHP/CodeSniffer" name="TraitSuffixRequiredForTraitSniff.php" role="php" />
         <file baseinstalldir="PHP/CodeSniffer" name="UpperCaseConstantNameSniff.php" role="php" />
        </dir>
@@ -615,8 +615,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="CamelCapsFunctionNameUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="ConstructorNameUnitTest.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="ConstructorNameUnitTest.php" role="test" />
-        <file baseinstalldir="PHP/CodeSniffer" name="AffixRequiredForInterfaceUnitTest.inc" role="test" />
-        <file baseinstalldir="PHP/CodeSniffer" name="AffixRequiredForInterfaceUnitTest.php" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="InterfaceSuffixRequiredForInterfaceUnitTest.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="InterfaceSuffixRequiredForInterfaceUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="TraitSuffixRequiredForTraitUnitTest.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="TraitSuffixRequiredForTraitUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="UpperCaseConstantNameUnitTest.inc" role="test" />

src/Standards/Generic/Docs/NamingConventions/AffixRequiredForInterfaceStandard.xml renamed to src/Standards/Generic/Docs/NamingConventions/InterfaceSuffixRequiredForInterfaceStandard.xml

@@ -1,7 +1,7 @@
 <documentation title="Interface name">
     <standard>
     <![CDATA[
-    Interfaces MUST be suffixed or prefixed by given affix: checks Interface suffix by default, e.g. BarInterface.
+    Interfaces MUST be suffixed by Interface: e.g. BarInterface.
     ]]>
     </standard>
     <code_comparison>

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

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Checks that interfaces are suffixed by Interface.
+ *
+ * @author  Anna Borzenko <[email protected]>
+ * @license https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Standards\Generic\Sniffs\NamingConventions;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class InterfaceSuffixRequiredForInterfaceSniff implements Sniff
+{
+
+
+    /**
+     * Registers the tokens that this sniff wants to listen for.
+     *
+     * @return int[]
+     */
+    public function register()
+    {
+        return [T_INTERFACE];
+
+    }//end register()
+
+
+    /**
+     * Processes this sniff, when one of its tokens is encountered.
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+     * @param int                         $stackPtr  The position of the current token
+     *                                               in the stack passed in $tokens.
+     *
+     * @return void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $interfaceName = $phpcsFile->getDeclarationName($stackPtr);
+        if ($interfaceName === null) {
+            return;
+        }
+
+        $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()
+
+
+}//end class

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

@@ -0,0 +1,27 @@
+<?php
+
+interface SomeNameInterface
+{
+
+}
+
+interface ISomeName // error
+{
+
+}
+
+interface ISomeNameInterface
+{
+
+}
+
+
+interface ISomeOtherNameinterface
+{
+
+}
+
+interface mInterface
+{
+
+}

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

@@ -1,6 +1,6 @@
 <?php
 /**
- * Unit test class for the AffixRequiredForInterface sniff.
+ * Unit test class for the InterfaceSuffixRequiredForInterface sniff.
  *
  * @author  Anna Borzenko <[email protected]>
  * @license https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
@@ -10,7 +10,7 @@
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
-class AffixRequiredForInterfaceUnitTest extends AbstractSniffUnitTest
+class InterfaceSuffixRequiredForInterfaceUnitTest extends AbstractSniffUnitTest
 {
 
 
@@ -24,13 +24,7 @@ class AffixRequiredForInterfaceUnitTest extends AbstractSniffUnitTest
      */
     public function getErrorList()
     {
-        return [
-            8  => 1,
-            32 => 1,
-            51 => 1,
-            62 => 1,
-            70 => 1,
-        ];
+        return [8 => 1];
 
     }//end getErrorList()