Allow mixed cases for icon and linkmod class matchers

Author: pattonwebz

CHANGELOG.md

@@ -4,6 +4,7 @@
 - More accurate regex matching of icon and linkmod classnames.
 - Changed composer package type to `library` from `wordpress-plugin` again.
 - Tests: Add unit tests for the function that separates classnames for the walker.
+- Fix case sensitive matching to now match mixes of upper and lower case.
 
 ## [4.0.1]
 - Fix untranslated string in fallback (this was lost in transition between v3 and v4, fixed again).

class-wp-bootstrap-navwalker.php

@@ -403,20 +403,20 @@ private function seporate_linkmods_and_icons_from_classes( $classes, &$linkmod_c
 			foreach ( $classes as $key => $class ) {
 				// If any special classes are found, store the class in it's
 				// holder array and and unset the item from $classes.
-				if ( preg_match( '/^disabled|^sr-only/', $class ) ) {
+				if ( preg_match( '/^disabled|^sr-only/i', $class ) ) {
 					// Test for .disabled or .sr-only classes.
 					$linkmod_classes[] = $class;
 					unset( $classes[ $key ] );
-				} elseif ( preg_match( '/^dropdown-header|^dropdown-divider/', $class ) && $depth > 0 ) {
+				} elseif ( preg_match( '/^dropdown-header|^dropdown-divider/i', $class ) && $depth > 0 ) {
 					// Test for .dropdown-header or .dropdown-divider and a
 					// depth greater than 0 - IE inside a dropdown.
 					$linkmod_classes[] = $class;
 					unset( $classes[ $key ] );
-				} elseif ( preg_match( '/^fa-(\S*)?|^fa(s|r|l|b)?(\s?)?$/', $class ) ) {
+				} elseif ( preg_match( '/^fa-(\S*)?|^fa(s|r|l|b)?(\s?)?$/i', $class ) ) {
 					// Font Awesome.
 					$icon_classes[] = $class;
 					unset( $classes[ $key ] );
-				} elseif ( preg_match( '/^glyphicon-(\S*)?|^glyphicon(\s?)$/', $class ) ) {
+				} elseif ( preg_match( '/^glyphicon-(\S*)?|^glyphicon(\s?)$/i', $class ) ) {
 					// Glyphicons.
 					$icon_classes[] = $class;
 					unset( $classes[ $key ] );

tests/test-navwalker.php

@@ -46,7 +46,8 @@ function setUp() {
 			'sr-only',
 		) );
 
-		// array of valid font-awesome icon class starters plus some randomly chosen icon classes.
+		// array of valid font-awesome icon class starters plus some randomly
+		// chosen icon classes and some variations of upper/lower case letters.
 		$this->some_fontawesome_classes = array(
 			'fa',
 			'fas',
@@ -58,9 +59,13 @@ function setUp() {
 			'fa-home',
 			'fa-bluetooth-b',
 			'fa-chess-rook',
+			'fA-home',
+			'Fa-HoMe',
+			'fa-HomE',
 		);
 
-		// array of valid glyphicon icon class starters plus some randomly chosen icon classes.
+		// array of valid glyphicon icon class starters plus some randomly
+		// chosen icon classes and some variations of upper/lower case letters.
 		$this->some_glyphicons_classes = array(
 			'glyphicon',
 			'glyphicon-asterisk',
@@ -70,6 +75,10 @@ function setUp() {
 			'glyphicon-sd-video',
 			'glyphicon-subscript',
 			'glyphicon-grain',
+			'Glyphicon-file',
+			'Glyphicon-File',
+			'glyphicon-File',
+			'glYphiCon-fiLe',
 		);
 
 	}