PrefixAllGlobals: do not add invalid prefixes to the validated list

Bug fix. Invalid prefixes which did not pass the second validation check would still be added to the `validated_prefixes` array and the sniff would still run, even though no valid prefixes were available.
WordPress · Jan 4, 2018 · 6ce4927 · 6ce4927
1 parent df05758
commit 6ce4927
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php b/WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php
@@ -750,6 +750,7 @@ private function validate_prefixes() {
 					array( $prefix )
 				);
 				unset( $this->prefixes[ $key ] );
+				continue;
 			}
 
 			// Lowercase the prefix to allow for direct compare.

diff --git a/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php b/WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php
@@ -33,7 +33,6 @@ public function getErrorList( $testFile = 'PrefixAllGlobalsUnitTest.inc' ) {
 			case 'PrefixAllGlobalsUnitTest.inc':
 				return array(
 					1   => 2, // 2 x error for incorrect prefix passed.
-					10  => 1,
 					18  => 1,
 					21  => 1,
 					22  => 1,
-Original file line number
+Diff line change
@@ Expand Up @@
     			case 'PrefixAllGlobalsUnitTest.inc':
     				return array(
 => 2, // 2 x error for incorrect prefix passed.
-=> 1,
 => 1,
 => 1,
 => 1,
@@ Expand Down @@