Skip to content

Commit 3650b7c

Browse files
committed
updated prefix globals
1 parent 406c8df commit 3650b7c

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.1.inc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -511,13 +511,13 @@ function aa_do_something(){}
511511

512512
// The following line mimics an empty prefix value.
513513
// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[] ,
514-
function aaa_do_something(){}
514+
function aaaa_do_something(){}
515515

516516
// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[] 😊
517517
function 😊_do_something(){}
518518

519-
// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[] 😊😊
520-
function 😊😊_do_something(){}
519+
// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[] 😊😊😊
520+
function 😊😊😊_do_something(){}
521521

522522
// Reset to the standard test prefixes.
523523
// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[] acronym,tgmpa
@@ -673,7 +673,4 @@ class WP_Atom_Server {
673673
}
674674
}
675675

676-
// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[] tod
677-
function tod_something() {}
678-
679676
// phpcs:set WordPress.NamingConventions.PrefixAllGlobals prefixes[]

WordPress/Tests/NamingConventions/PrefixAllGlobalsUnitTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function getErrorList( $testFile = 'PrefixAllGlobalsUnitTest.1.inc' ) {
3434
switch ( $testFile ) {
3535
case 'PrefixAllGlobalsUnitTest.1.inc':
3636
return array(
37-
1 => 9, // 2 x error for blocked prefix passed. 5 x error for short prefixes. 2 x no prefix.
37+
1 => 8, // 2 x error for blocked prefix passed. 4 x error for short prefixes. 2 x no prefix.
3838
10 => 1,
3939
18 => 1,
4040
21 => 1,
@@ -96,7 +96,6 @@ public function getErrorList( $testFile = 'PrefixAllGlobalsUnitTest.1.inc' ) {
9696
616 => 1,
9797
617 => 1,
9898
633 => 1,
99-
677 => 1,
10099
);
101100

102101
case 'PrefixAllGlobalsUnitTest.4.inc':

0 commit comments

Comments
 (0)