Move lowecasing functionality at the beginning of the helper

There are some early returns that would make lowecasing not happen even if we passed the last parameter as true.
WordPress · Sep 18, 2023 · 0cdebde · 0cdebde
1 parent 4556d69
commit 0cdebde
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/WordPress/Helpers/RulesetPropertyHelper.php b/WordPress/Helpers/RulesetPropertyHelper.php
@@ -54,6 +54,13 @@ final class RulesetPropertyHelper {
 	 * @return array
 	 */
 	public static function merge_custom_array( $custom, array $base = array(), $flip = true, $lowercaseKeyValues = false ) {
+		if ( $lowercaseKeyValues ) {
+			$base = array_map( 'strtolower', $base );
+			$custom = array_map( 'strtolower', $custom );
+			$base = array_change_key_case( $base );
+			$custom = array_change_key_case( $custom );
+		}
+
 		if ( true === $flip ) {
 			$base = array_filter( $base );
 		}
@@ -70,13 +77,6 @@ public static function merge_custom_array( $custom, array $base = array(), $flip
 			return $custom;
 		}
 
-		if ( $lowercaseKeyValues ) {
-			$base = array_map( 'strtolower', $base );
-			$custom = array_map( 'strtolower', $custom );
-			$base = array_change_key_case( $base );
-			$custom = array_change_key_case( $custom );
-		}
-
 		return array_merge( $base, $custom );
 	}
 }