minor tweaks to the style engine (#43111)

WordPress · Aug 15, 2022 · a2eed55 · a2eed55
1 parent c2b0085
commit a2eed55
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 25 deletions.
diff --git a/packages/style-engine/class-wp-style-engine-css-declarations.php b/packages/style-engine/class-wp-style-engine-css-declarations.php
@@ -34,9 +34,6 @@ class WP_Style_Engine_CSS_Declarations {
 	 * @param array $declarations An array of declarations (property => value pairs).
 	 */
 	public function __construct( $declarations = array() ) {
-		if ( empty( $declarations ) ) {
-			return;
-		}
 		$this->add_declarations( $declarations );
 	}
 
@@ -94,12 +91,12 @@ public function add_declarations( $declarations ) {
 	/**
 	 * Remove multiple declarations.
 	 *
-	 * @param array $declarations An array of properties.
+	 * @param array $properties An array of properties.
 	 *
 	 * @return void
 	 */
-	public function remove_declarations( $declarations = array() ) {
-		foreach ( $declarations as $property ) {
+	public function remove_declarations( $properties = array() ) {
+		foreach ( $properties as $property ) {
 			$this->remove_declaration( $property );
 		}
 	}
@@ -123,10 +120,7 @@ public function get_declarations() {
 	 * @return string The filtered declaration as a single string.
 	 */
 	protected static function filter_declaration( $property, $value, $spacer = '' ) {
-		if ( isset( $property ) && isset( $value ) ) {
-			return safecss_filter_attr( "{$property}:{$spacer}{$value}" );
-		}
-		return '';
+		return safecss_filter_attr( "{$property}:{$spacer}{$value}" );
 	}
 
 	/**
@@ -143,9 +137,9 @@ public function get_declarations_string( $should_prettify = false, $indent_count
 		$indent              = $should_prettify ? str_repeat( "\t", $indent_count ) : '';
 		$suffix              = $should_prettify ? ' ' : '';
 		$suffix              = $should_prettify && $indent_count > 0 ? "\n" : $suffix;
+		$spacer              = $should_prettify ? ' ' : '';
 
 		foreach ( $declarations_array as $property => $value ) {
-			$spacer               = $should_prettify ? ' ' : '';
 			$filtered_declaration = static::filter_declaration( $property, $value, $spacer );
 			if ( $filtered_declaration ) {
 				$declarations_output .= "{$indent}{$filtered_declaration};$suffix";

diff --git a/packages/style-engine/class-wp-style-engine-css-rule.php b/packages/style-engine/class-wp-style-engine-css-rule.php
@@ -51,14 +51,10 @@ public function __construct( $selector = '', $declarations = array() ) {
 	 *
 	 * @param string $selector The CSS selector.
 	 *
-	 * @return WP_Style_Engine_CSS_Rule|void Returns the object to allow chaining of methods.
+	 * @return WP_Style_Engine_CSS_Rule Returns the object to allow chaining of methods.
 	 */
 	public function set_selector( $selector ) {
-		if ( empty( $selector ) ) {
-			return;
-		}
 		$this->selector = $selector;
-
 		return $this;
 	}
 

diff --git a/packages/style-engine/class-wp-style-engine-css-rules-store.php b/packages/style-engine/class-wp-style-engine-css-rules-store.php
@@ -27,7 +27,6 @@ class WP_Style_Engine_CSS_Rules_Store {
 	 */
 	protected static $stores = array();
 
-
 	/**
 	 * The store name.
 	 *
@@ -114,7 +113,6 @@ public function get_all_rules() {
 	 * @return WP_Style_Engine_CSS_Rule|null Returns a WP_Style_Engine_CSS_Rule object, or null if the selector is empty.
 	 */
 	public function add_rule( $selector ) {
-
 		$selector = trim( $selector );
 
 		// Bail early if there is no selector.

diff --git a/packages/style-engine/class-wp-style-engine-processor.php b/packages/style-engine/class-wp-style-engine-processor.php
@@ -73,7 +73,7 @@ public function add_rules( $css_rules ) {
 	public function get_css( $options = array() ) {
 		$defaults = array(
 			'optimize' => true,
-			'prettify' => false,
+			'prettify' => defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG,
 		);
 		$options  = wp_parse_args( $options, $defaults );
 

diff --git a/packages/style-engine/class-wp-style-engine.php b/packages/style-engine/class-wp-style-engine.php
@@ -264,11 +264,7 @@ protected static function is_valid_style_value( $style_value ) {
 			return true;
 		}
 
-		if ( empty( $style_value ) ) {
-			return false;
-		}
-
-		return true;
+		return ! empty( $style_value );
 	}
 
 	/**
@@ -512,7 +508,7 @@ public static function compile_css( $css_declarations, $css_selector ) {
 	public static function compile_stylesheet_from_css_rules( $css_rules ) {
 		$processor = new WP_Style_Engine_Processor();
 		$processor->add_rules( $css_rules );
-		return $processor->get_css( array( 'prettify' => defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) );
+		return $processor->get_css();
 	}
 }