From 0f7c7539e28c95c8719dcc98a6d442be67f0e481 Mon Sep 17 00:00:00 2001
From: ramonjd <ramonjd@gmail.com>
Date: Fri, 15 Jul 2022 18:47:41 +1000
Subject: [PATCH] Post trunk merge cleanup and update tests.

---
 packages/style-engine/class-wp-style-engine-css-rule.php  | 4 ++--
 packages/style-engine/class-wp-style-engine.php           | 5 +++--
 .../phpunit/class-wp-style-engine-css-rule-test.php       | 8 ++++----
 .../style-engine/phpunit/class-wp-style-engine-test.php   | 2 ++
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/style-engine/class-wp-style-engine-css-rule.php b/packages/style-engine/class-wp-style-engine-css-rule.php
index 855dd7ecc4b712..3a608e561fbf41 100644
--- a/packages/style-engine/class-wp-style-engine-css-rule.php
+++ b/packages/style-engine/class-wp-style-engine-css-rule.php
@@ -51,7 +51,7 @@ public function __construct( $selector = '', $declarations = array() ) {
 	 *
 	 * @param string $selector The CSS selector.
 	 *
-	 * @return WP_Style_Engine_CSS_Rule Returns the object to allow chaining of methods.
+	 * @return WP_Style_Engine_CSS_Rule|void Returns the object to allow chaining of methods.
 	 */
 	public function set_selector( $selector ) {
 		if ( empty( $selector ) ) {
@@ -110,6 +110,6 @@ public function get_selector() {
 	 * @return string
 	 */
 	public function get_css() {
-		return $this->get_selector() . ' {' . $this->declarations->get_declarations_string() . '}';
+		return $this->get_selector() . ' { ' . $this->declarations->get_declarations_string() . ' }';
 	}
 }
diff --git a/packages/style-engine/class-wp-style-engine.php b/packages/style-engine/class-wp-style-engine.php
index 05af9a549fb62a..32551e833569bc 100644
--- a/packages/style-engine/class-wp-style-engine.php
+++ b/packages/style-engine/class-wp-style-engine.php
@@ -518,9 +518,10 @@ public function get_block_supports_styles( $block_styles, $options ) {
 			$styles_output['declarations'] = $css_declarations->get_declarations();
 			// Return an entire rule if there is a selector.
 			if ( $css_selector ) {
-				$styles_output['css'] = $css_selector . ' { ' . $css . ' }';
+				$css_rule             = new WP_Style_Engine_CSS_Rule( $css_selector, $css_declarations );
+				$styles_output['css'] = $css_rule->get_css();
 				if ( $should_store_and_enqueue ) {
-					$stored_css_rule = static::$stores['block-supports']->get_rule( $css_selector );
+					$stored_css_rule = static::$stores['block-supports']->add_rule( $css_selector );
 					$stored_css_rule->set_declarations( $css_declarations );
 				}
 			}
diff --git a/packages/style-engine/phpunit/class-wp-style-engine-css-rule-test.php b/packages/style-engine/phpunit/class-wp-style-engine-css-rule-test.php
index 9a42ade4acb16f..cb462b3765bfe6 100644
--- a/packages/style-engine/phpunit/class-wp-style-engine-css-rule-test.php
+++ b/packages/style-engine/phpunit/class-wp-style-engine-css-rule-test.php
@@ -27,7 +27,7 @@ public function test_instantiate_with_selector_and_rules() {
 
 		$this->assertSame( $selector, $css_rule->get_selector() );
 
-		$expected = "$selector {{$css_declarations->get_declarations_string()}}";
+		$expected = "$selector { {$css_declarations->get_declarations_string()} }";
 		$this->assertSame( $expected, $css_rule->get_css() );
 	}
 
@@ -45,7 +45,7 @@ public function test_dedupe_properties_in_rules() {
 		$css_rule                    = new WP_Style_Engine_CSS_Rule( $selector, $first_declaration );
 		$css_rule->set_declarations( new WP_Style_Engine_CSS_Declarations( $overwrite_first_declaration ) );
 
-		$expected = '.taggart {font-size: 4px;}';
+		$expected = '.taggart { font-size: 4px; }';
 		$this->assertSame( $expected, $css_rule->get_css() );
 	}
 
@@ -60,7 +60,7 @@ public function test_set_declarations() {
 		$css_rule                   = new WP_Style_Engine_CSS_Rule( '.hill-street-blues', $some_css_declarations );
 		$css_rule->set_declarations( $some_more_css_declarations );
 
-		$expected = '.hill-street-blues {margin-top: 10px; font-size: 1rem;}';
+		$expected = '.hill-street-blues { margin-top: 10px; font-size: 1rem; }';
 		$this->assertSame( $expected, $css_rule->get_css() );
 	}
 
@@ -89,7 +89,7 @@ public function test_get_css() {
 		);
 		$css_declarations   = new WP_Style_Engine_CSS_Declarations( $input_declarations );
 		$css_rule           = new WP_Style_Engine_CSS_Rule( $selector, $css_declarations );
-		$expected           = "$selector {{$css_declarations->get_declarations_string()}}";
+		$expected           = "$selector { {$css_declarations->get_declarations_string()} }";
 
 		$this->assertSame( $expected, $css_rule->get_css() );
 	}
diff --git a/packages/style-engine/phpunit/class-wp-style-engine-test.php b/packages/style-engine/phpunit/class-wp-style-engine-test.php
index 13334233ca445f..f10e145758362e 100644
--- a/packages/style-engine/phpunit/class-wp-style-engine-test.php
+++ b/packages/style-engine/phpunit/class-wp-style-engine-test.php
@@ -7,6 +7,8 @@
  */
 
 require __DIR__ . '/../class-wp-style-engine-css-declarations.php';
+require __DIR__ . '/../class-wp-style-engine-css-rule.php';
+require __DIR__ . '/../class-wp-style-engine-css-rules-store.php';
 require __DIR__ . '/../class-wp-style-engine.php';
 
 /**