Refactor to just update declarations

lib/compat/wordpress-6.1/class-wp-theme-json-6-1.php

@@ -768,6 +768,50 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 		return $stylesheet;
 	}
 
+	/**
+	 * Returns the stylesheet if there is a separator block with only a background style defined on theme.json.
+	 *
+	 * @param array $declarations List of declarations.
+	 *
+	 * returns string The stylesheet.
+	 */
+	private function update_separator_declarations( $declarations ) {
+		$background_matches = array_values(
+			array_filter(
+				$declarations,
+				function( $declaration ) {
+					return 'background-color' === $declaration['name'];
+				}
+			)
+		);
+		if ( ! empty( $background_matches && isset( $background_matches[0]['value'] ) ) ) {
+			$border_color_matches = array_values(
+				array_filter(
+					$declarations,
+					function( $declaration ) {
+						return 'border-color' === $declaration['name'];
+					}
+				)
+			);
+			$text_color_matches   = array_values(
+				array_filter(
+					$declarations,
+					function( $declaration ) {
+						return 'color' === $declaration['name'];
+					}
+				)
+			);
+			if ( empty( $border_color_matches ) && empty( $text_color_matches ) ) {
+				$declarations[] = array(
+					'name'  => 'color',
+					'value' => $background_matches[0]['value'],
+				);
+			}
+		}
+
+		return $declarations;
+	}
+
 	/**
 	 * Gets the CSS rules for a particular block from theme.json.
 	 *
@@ -856,6 +900,11 @@ function( $pseudo_selector ) use ( $selector ) {
 			}
 		}
 
+		// Update declarations if there are separators with only background color defined.
+		if ( '.wp-block-separator' === $selector ) {
+			$declarations = static::update_separator_declarations( $declarations );
+		}
+
 		// 2. Generate and append the rules that use the general selector.
 		$block_rules .= static::to_ruleset( $selector, $declarations );
 
@@ -878,41 +927,6 @@ function( $pseudo_selector ) use ( $selector ) {
 			$block_rules .= static::to_ruleset( $feature_selector, $individual_feature_declarations );
 		}
 
-		// Add border color if we have a separator with a bg color defined.
-		if ( '.wp-block-separator' === $selector ) {
-			$border_color_matches = array_values(
-				array_filter(
-					$declarations,
-					function( $declaration ) {
-						return 'border-color' === $declaration['name'];
-					}
-				)
-			);
-			$text_color_matches   = array_values(
-				array_filter(
-					$declarations,
-					function( $declaration ) {
-						return 'color' === $declaration['name'];
-					}
-				)
-			);
-			$background_matches   = array_values(
-				array_filter(
-					$declarations,
-					function( $declaration ) {
-						return 'background-color' === $declaration['name'];
-					}
-				)
-			);
-			if ( ! empty( $background_matches && isset( $background_matches[0]['value'] ) ) && empty( $border_color_matches ) && empty( $text_color_matches ) ) {
-				$declarations[] = array(
-					'name'  => 'color',
-					'value' => $background_matches[0]['value'],
-				);
-				$block_rules    = static::to_ruleset( $selector, $declarations );
-			}
-		}
-
 		return $block_rules;
 	}