@@ -2364,11 +2364,7 @@ public function add_non_persistent_groups( $groups ) {
 	public function get_from_runtime_cache( $key, $group ) {
 		$derived_key = $this->buildKey( $key, $group );
 
-		if ( isset( $this->cache[ $derived_key ] ) ) {
-			return $this->cache[ $derived_key ];
-		}
-
-		return false;
+		return $this->cache[ $derived_key ] ?? false;
 	}
 
 	/**
 
@@ -308,11 +308,7 @@ public function get_expected_fonts_for_fonts_block_theme( $key = '' ) {
 			);
 		}
 
-		if ( isset( $data[ $key ] ) ) {
-			return $data[ $key ];
-		}
-
-		return $data;
+		return $data[ $key ] ?? $data;
 	}
 
 	public static function get_custom_font_families( $key = '' ) {
@@ -397,11 +393,7 @@ public static function get_custom_font_families( $key = '' ) {
 			);
 		}
 
-		if ( isset( $data[ $key ] ) ) {
-			return $data[ $key ];
-		}
-
-		return $data;
+		return $data[ $key ] ?? $data;
 	}
 
 	public static function get_custom_style_variations( $key = '' ) {
@@ -488,10 +480,6 @@ public static function get_custom_style_variations( $key = '' ) {
 			);
 		}
 
-		if ( isset( $data[ $key ] ) ) {
-			return $data[ $key ];
-		}
-
-		return $data;
+		return $data[ $key ] ?? $data;
 	}
 }
Original file line number	Diff line number	Diff line change
`@@ -308,11 +308,7 @@ public function get_expected_fonts_for_fonts_block_theme( $key = '' ) {`
`308`	`308`	`);`
`309`	`309`	`}`
`310`	`310`
`311`		`- if ( isset( $data[ $key ] ) ) {`
`312`		`- return $data[ $key ];`
`313`		`- }`
`314`		`-`
`315`		`- return $data;`
	`311`	`+ return $data[ $key ] ?? $data;`
`316`	`312`	`}`
`317`	`313`
`318`	`314`	`public static function get_custom_font_families( $key = '' ) {`
`@@ -397,11 +393,7 @@ public static function get_custom_font_families( $key = '' ) {`
`397`	`393`	`);`
`398`	`394`	`}`
`399`	`395`
`400`		`- if ( isset( $data[ $key ] ) ) {`
`401`		`- return $data[ $key ];`
`402`		`- }`
`403`		`-`
`404`		`- return $data;`
	`396`	`+ return $data[ $key ] ?? $data;`
`405`	`397`	`}`
`406`	`398`
`407`	`399`	`public static function get_custom_style_variations( $key = '' ) {`
`@@ -488,10 +480,6 @@ public static function get_custom_style_variations( $key = '' ) {`
`488`	`480`	`);`
`489`	`481`	`}`
`490`	`482`
`491`		`- if ( isset( $data[ $key ] ) ) {`
`492`		`- return $data[ $key ];`
`493`		`- }`
`494`		`-`
`495`		`- return $data;`
	`483`	`+ return $data[ $key ] ?? $data;`
`496`	`484`	`}`
`497`	`485`	`}`