Merge branch 'feature/issue-1152-trait-naming-conventions' of https://github.com/jrfnl/PHP_CodeSniffer

Author: gsherwood

CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php

@@ -42,6 +42,7 @@ public function register()
         return array(
                 T_CLASS,
                 T_INTERFACE,
+                T_TRAIT,
                );
 
     }//end register()

CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.inc

@@ -45,4 +45,24 @@ class Invalid__Name {}
 
 interface Invalid__Name {}
 
-?>
+trait Valid_Name {}
+
+trait invalid_Name {}
+
+trait invalid_name {}
+
+trait Invalid_name {}
+
+trait VALID_Name {}
+
+trait VALID_NAME {}
+
+trait VALID_Name {}
+
+trait ValidName {}
+
+trait _Invalid_Name {}
+
+trait ___ {}
+
+trait Invalid__Name {}

CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php

@@ -55,6 +55,12 @@ public function getErrorList()
                 42 => 2,
                 44 => 1,
                 46 => 1,
+                50 => 1,
+                52 => 2,
+                54 => 1,
+                64 => 1,
+                66 => 2,
+                68 => 1,
                );
 
     }//end getErrorList()

CodeSniffer/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php

@@ -41,6 +41,7 @@ public function register()
         return array(
                 T_CLASS,
                 T_INTERFACE,
+                T_TRAIT,
                );
 
     }//end register()

CodeSniffer/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.inc

@@ -48,3 +48,91 @@ class Base
         };
     }
 }
+
+// Valid interface name.
+interface ValidCamelCaseClass extends MyClass {}
+
+
+// Incorrect usage of camel case.
+interface invalidCamelCaseClass extends MyClass {}
+interface Invalid_Camel_Case_Class_With_Underscores implements MyClass {}
+
+
+// All lowercase.
+interface invalidlowercaseclass extends MyClass {}
+interface invalid_lowercase_class_with_underscores extends MyClass {}
+
+
+// All uppercase.
+interface VALIDUPPERCASECLASS extends MyClass {}
+interface INVALID_UPPERCASE_CLASS_WITH_UNDERSCORES extends MyClass {}
+
+
+// Mix camel case with uppercase.
+interface ValidCamelCaseClassWithUPPERCASE extends MyClass {}
+
+
+// Usage of numeric characters.
+interface ValidCamelCaseClassWith1Number extends MyClass {}
+interface ValidCamelCaseClassWith12345Numbers extends MyClass {}
+interface 5InvalidCamelCaseClassStartingWithNumber extends MyClass {}
+interface ValidCamelCaseClassEndingWithNumber5 extends MyClass {}
+interface 12345 extends MyClass {}
+
+interface Testing{}
+
+interface Base
+{
+    protected $anonymous;
+
+    public function __construct();
+}
+
+
+// Valid trait name.
+trait ValidCamelCaseClass extends MyClass {}
+
+
+// Incorrect usage of camel case.
+trait invalidCamelCaseClass extends MyClass {}
+trait Invalid_Camel_Case_Class_With_Underscores implements MyClass {}
+
+
+// All lowercase.
+trait invalidlowercaseclass extends MyClass {}
+trait invalid_lowercase_class_with_underscores extends MyClass {}
+
+
+// All uppercase.
+trait VALIDUPPERCASECLASS extends MyClass {}
+trait INVALID_UPPERCASE_CLASS_WITH_UNDERSCORES extends MyClass {}
+
+
+// Mix camel case with uppercase.
+trait ValidCamelCaseClassWithUPPERCASE extends MyClass {}
+
+
+// Usage of numeric characters.
+trait ValidCamelCaseClassWith1Number extends MyClass {}
+trait ValidCamelCaseClassWith12345Numbers extends MyClass {}
+trait 5InvalidCamelCaseClassStartingWithNumber extends MyClass {}
+trait ValidCamelCaseClassEndingWithNumber5 extends MyClass {}
+trait 12345 extends MyClass {}
+
+trait Testing{}
+
+trait Base
+{
+    protected $anonymous;
+
+    public function __construct()
+    {
+        $this->anonymous = new class extends ArrayObject
+        {
+            public function __construct()
+            {
+                parent::__construct(['a' => 1, 'b' => 2]);
+            }
+        };
+    }
+}

CodeSniffer/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php

@@ -43,13 +43,27 @@ class Squiz_Tests_Classes_ValidClassNameUnitTest extends AbstractSniffUnitTest
     public function getErrorList()
     {
         return array(
-                9  => 1,
-                10 => 1,
-                14 => 1,
-                15 => 1,
-                20 => 1,
-                30 => 1,
-                32 => 1,
+                9   => 1,
+                10  => 1,
+                14  => 1,
+                15  => 1,
+                20  => 1,
+                30  => 1,
+                32  => 1,
+                57  => 1,
+                58  => 1,
+                62  => 1,
+                63  => 1,
+                68  => 1,
+                78  => 1,
+                80  => 1,
+                97  => 1,
+                98  => 1,
+                102 => 1,
+                103 => 1,
+                108 => 1,
+                118 => 1,
+                120 => 1,
                );
 
     }//end getErrorList()