Merge pull request #2300 from WordPress/feature/validvariablename-bring-back-catID

NamingConventions/ValidVariableName: bring back `$catID`

Author: dingo-d

WordPress/Sniffs/NamingConventions/ValidVariableNameSniff.php

@@ -66,6 +66,7 @@ final class ValidVariableNameSniff extends PHPCS_AbstractVariableSniff {
 	 * @var array
 	 */
 	protected $allowed_mixed_case_member_var_names = array(
+		'cat_ID'            => true,
 		'comment_ID'        => true,
 		'comment_author_IP' => true,
 		'comment_post_ID'   => true,

WordPress/Tests/NamingConventions/ValidVariableNameUnitTest.php

@@ -71,8 +71,7 @@ public function getErrorList() {
 			103 => 1,
 			104 => 1,
 			105 => 1,
-			120 => 1,
-			121 => 2,
+			121 => 1,
 			126 => 1,
 			138 => 1,
 			145 => 1,