iqltechnologies / brighty

plugins/woocommerce/packages/woocommerce-blocks/src/Registry/SharedType.php

Indentation +20 added lines, -20 removed lines

@@ -8,25 +8,25 @@
  */
 class SharedType extends AbstractDependencyType {
 
-	/**
-	 * Holds a cached instance of the value stored (or returned) internally.
-	 *
-	 * @var mixed
-	 */
-	private $shared_instance;
+    /**
+     * Holds a cached instance of the value stored (or returned) internally.
+     *
+     * @var mixed
+     */
+    private $shared_instance;
 
-	/**
-	 * Returns the internal stored and shared value after initial generation.
-	 *
-	 * @param Container $container An instance of the dependency injection
-	 *                             container.
-	 *
-	 * @return mixed
-	 */
-	public function get( Container $container ) {
-		if ( empty( $this->shared_instance ) ) {
-			$this->shared_instance = $this->resolve_value( $container );
-		}
-		return $this->shared_instance;
-	}
+    /**
+     * Returns the internal stored and shared value after initial generation.
+     *
+     * @param Container $container An instance of the dependency injection
+     *                             container.
+     *
+     * @return mixed
+     */
+    public function get( Container $container ) {
+        if ( empty( $this->shared_instance ) ) {
+            $this->shared_instance = $this->resolve_value( $container );
+        }
+        return $this->shared_instance;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -23,9 +23,9 @@
 	 *
 	 * @return mixed
 	 */
-	public function get( Container $container ) {
-		if ( empty( $this->shared_instance ) ) {
-			$this->shared_instance = $this->resolve_value( $container );
+	public function get(Container $container) {
+		if (empty($this->shared_instance)) {
+			$this->shared_instance = $this->resolve_value($container);
 		}
 		return $this->shared_instance;
 	}

plugins/woocommerce/packages/woocommerce-blocks/src/Registry/Container.php

Indentation +79 added lines, -79 removed lines

@@ -13,86 +13,86 @@
  */
 class Container {
 
-	/**
-	 * A map of Dependency Type objects used to resolve dependencies.
-	 *
-	 * @var AbstractDependencyType[]
-	 */
-	private $registry = [];
+    /**
+     * A map of Dependency Type objects used to resolve dependencies.
+     *
+     * @var AbstractDependencyType[]
+     */
+    private $registry = [];
 
-	/**
-	 * Public api for adding a factory to the container.
-	 *
-	 * Factory dependencies will have the instantiation callback invoked
-	 * every time the dependency is requested.
-	 *
-	 * Typical Usage:
-	 *
-	 * ```
-	 * $container->register( MyClass::class, $container->factory( $mycallback ) );
-	 * ```
-	 *
-	 * @param Closure $instantiation_callback  This will be invoked when the
-	 *                                         dependency is required.  It will
-	 *                                         receive an instance of this
-	 *                                         container so the callback can
-	 *                                         retrieve dependencies from the
-	 *                                         container.
-	 *
-	 * @return FactoryType  An instance of the FactoryType dependency.
-	 */
-	public function factory( Closure $instantiation_callback ) {
-		return new FactoryType( $instantiation_callback );
-	}
+    /**
+     * Public api for adding a factory to the container.
+     *
+     * Factory dependencies will have the instantiation callback invoked
+     * every time the dependency is requested.
+     *
+     * Typical Usage:
+     *
+     * ```
+     * $container->register( MyClass::class, $container->factory( $mycallback ) );
+     * ```
+     *
+     * @param Closure $instantiation_callback  This will be invoked when the
+     *                                         dependency is required.  It will
+     *                                         receive an instance of this
+     *                                         container so the callback can
+     *                                         retrieve dependencies from the
+     *                                         container.
+     *
+     * @return FactoryType  An instance of the FactoryType dependency.
+     */
+    public function factory( Closure $instantiation_callback ) {
+        return new FactoryType( $instantiation_callback );
+    }
 
-	/**
-	 * Interface for registering a new dependency with the container.
-	 *
-	 * By default, the $value will be added as a shared dependency.  This means
-	 * that it will be a single instance shared among any other classes having
-	 * that dependency.
-	 *
-	 * If you want a new instance every time it's required, then wrap the value
-	 * in a call to the factory method (@see Container::factory for example)
-	 *
-	 * Note: Currently if the provided id already is registered in the container,
-	 * the provided value is ignored.
-	 *
-	 * @param string $id    A unique string identifier for the provided value.
-	 *                      Typically it's the fully qualified name for the
-	 *                      dependency.
-	 * @param mixed  $value The value for the dependency. Typically, this is a
-	 *                      closure that will create the class instance needed.
-	 */
-	public function register( $id, $value ) {
-		if ( empty( $this->registry[ $id ] ) ) {
-			if ( ! $value instanceof FactoryType ) {
-				$value = new SharedType( $value );
-			}
-			$this->registry[ $id ] = $value;
-		}
-	}
+    /**
+     * Interface for registering a new dependency with the container.
+     *
+     * By default, the $value will be added as a shared dependency.  This means
+     * that it will be a single instance shared among any other classes having
+     * that dependency.
+     *
+     * If you want a new instance every time it's required, then wrap the value
+     * in a call to the factory method (@see Container::factory for example)
+     *
+     * Note: Currently if the provided id already is registered in the container,
+     * the provided value is ignored.
+     *
+     * @param string $id    A unique string identifier for the provided value.
+     *                      Typically it's the fully qualified name for the
+     *                      dependency.
+     * @param mixed  $value The value for the dependency. Typically, this is a
+     *                      closure that will create the class instance needed.
+     */
+    public function register( $id, $value ) {
+        if ( empty( $this->registry[ $id ] ) ) {
+            if ( ! $value instanceof FactoryType ) {
+                $value = new SharedType( $value );
+            }
+            $this->registry[ $id ] = $value;
+        }
+    }
 
-	/**
-	 * Interface for retrieving the dependency stored in the container for the
-	 * given identifier.
-	 *
-	 * @param string $id  The identifier for the dependency being retrieved.
-	 * @throws Exception  If there is no dependency for the given identifier in
-	 *                    the container.
-	 *
-	 * @return mixed  Typically a class instance.
-	 */
-	public function get( $id ) {
-		if ( ! isset( $this->registry[ $id ] ) ) {
-			// this is a developer facing exception, hence it is not localized.
-			throw new Exception(
-				sprintf(
-					'Cannot construct an instance of %s because it has not been registered.',
-					$id
-				)
-			);
-		}
-		return $this->registry[ $id ]->get( $this );
-	}
+    /**
+     * Interface for retrieving the dependency stored in the container for the
+     * given identifier.
+     *
+     * @param string $id  The identifier for the dependency being retrieved.
+     * @throws Exception  If there is no dependency for the given identifier in
+     *                    the container.
+     *
+     * @return mixed  Typically a class instance.
+     */
+    public function get( $id ) {
+        if ( ! isset( $this->registry[ $id ] ) ) {
+            // this is a developer facing exception, hence it is not localized.
+            throw new Exception(
+                sprintf(
+                    'Cannot construct an instance of %s because it has not been registered.',
+                    $id
+                )
+            );
+        }
+        return $this->registry[ $id ]->get( $this );
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -41,8 +41,8 @@ 
 	 *
 	 * @return FactoryType  An instance of the FactoryType dependency.
 	 */
-	public function factory( Closure $instantiation_callback ) {
-		return new FactoryType( $instantiation_callback );
+	public function factory(Closure $instantiation_callback) {
+		return new FactoryType($instantiation_callback);
 	}
 
 	/**
@@ -64,12 +64,12 @@ 
 	 * @param mixed  $value The value for the dependency. Typically, this is a
 	 *                      closure that will create the class instance needed.
 	 */
-	public function register( $id, $value ) {
-		if ( empty( $this->registry[ $id ] ) ) {
-			if ( ! $value instanceof FactoryType ) {
-				$value = new SharedType( $value );
+	public function register($id, $value) {
+		if (empty($this->registry[$id])) {
+			if (!$value instanceof FactoryType) {
+				$value = new SharedType($value);
 			}
-			$this->registry[ $id ] = $value;
+			$this->registry[$id] = $value;
 		}
 	}
 
@@ -83,8 +83,8 @@ 
 	 *
 	 * @return mixed  Typically a class instance.
 	 */
-	public function get( $id ) {
-		if ( ! isset( $this->registry[ $id ] ) ) {
+	public function get($id) {
+		if (!isset($this->registry[$id])) {
 			// this is a developer facing exception, hence it is not localized.
 			throw new Exception(
 				sprintf(
@@ -93,6 +93,6 @@ 
 				)
 			);
 		}
-		return $this->registry[ $id ]->get( $this );
+		return $this->registry[$id]->get($this);
 	}
 }

plugins/woocommerce/packages/woocommerce-blocks/src/Registry/AbstractDependencyType.php

Indentation +36 added lines, -36 removed lines

@@ -12,43 +12,43 @@
  */
 abstract class AbstractDependencyType {
 
-	/**
-	 * Holds a callable or value provided for this type.
-	 *
-	 * @var mixed
-	 */
-	private $callable_or_value;
+    /**
+     * Holds a callable or value provided for this type.
+     *
+     * @var mixed
+     */
+    private $callable_or_value;
 
-	/**
-	 * Constructor
-	 *
-	 * @param mixed $callable_or_value  A callable or value for the dependency
-	 *                                  type instance.
-	 */
-	public function __construct( $callable_or_value ) {
-		$this->callable_or_value = $callable_or_value;
-	}
+    /**
+     * Constructor
+     *
+     * @param mixed $callable_or_value  A callable or value for the dependency
+     *                                  type instance.
+     */
+    public function __construct( $callable_or_value ) {
+        $this->callable_or_value = $callable_or_value;
+    }
 
-	/**
-	 * Resolver for the internal dependency value.
-	 *
-	 * @param Container $container  The Dependency Injection Container.
-	 *
-	 * @return mixed
-	 */
-	protected function resolve_value( Container $container ) {
-		$callback = $this->callable_or_value;
-		return \is_callable( $callback )
-			? $callback( $container )
-			: $callback;
-	}
+    /**
+     * Resolver for the internal dependency value.
+     *
+     * @param Container $container  The Dependency Injection Container.
+     *
+     * @return mixed
+     */
+    protected function resolve_value( Container $container ) {
+        $callback = $this->callable_or_value;
+        return \is_callable( $callback )
+            ? $callback( $container )
+            : $callback;
+    }
 
-	/**
-	 * Retrieves the value stored internally for this DependencyType
-	 *
-	 * @param Container $container  The Dependency Injection Container.
-	 *
-	 * @return void
-	 */
-	abstract public function get( Container $container );
+    /**
+     * Retrieves the value stored internally for this DependencyType
+     *
+     * @param Container $container  The Dependency Injection Container.
+     *
+     * @return void
+     */
+    abstract public function get( Container $container );
 }

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
 	 * @param mixed $callable_or_value  A callable or value for the dependency
 	 *                                  type instance.
 	 */
-	public function __construct( $callable_or_value ) {
+	public function __construct($callable_or_value) {
 		$this->callable_or_value = $callable_or_value;
 	}
 
@@ -36,10 +36,10 @@ 
 	 *
 	 * @return mixed
 	 */
-	protected function resolve_value( Container $container ) {
+	protected function resolve_value(Container $container) {
 		$callback = $this->callable_or_value;
-		return \is_callable( $callback )
-			? $callback( $container )
+		return \is_callable($callback)
+			? $callback($container)
 			: $callback;
 	}
 
@@ -50,5 +50,5 @@ 
 	 *
 	 * @return void
 	 */
-	abstract public function get( Container $container );
+	abstract public function get(Container $container);
 }

plugins/woocommerce/packages/woocommerce-blocks/src/Registry/FactoryType.php

Indentation +11 added lines, -11 removed lines

@@ -7,15 +7,15 @@
  * @since 2.5.0
  */
 class FactoryType extends AbstractDependencyType {
-	/**
-	 * Invokes and returns the value from the stored internal callback.
-	 *
-	 * @param Container $container  An instance of the dependency injection
-	 *                              container.
-	 *
-	 * @return mixed
-	 */
-	public function get( Container $container ) {
-		return $this->resolve_value( $container );
-	}
+    /**
+     * Invokes and returns the value from the stored internal callback.
+     *
+     * @param Container $container  An instance of the dependency injection
+     *                              container.
+     *
+     * @return mixed
+     */
+    public function get( Container $container ) {
+        return $this->resolve_value( $container );
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@
 	 *
 	 * @return mixed
 	 */
-	public function get( Container $container ) {
-		return $this->resolve_value( $container );
+	public function get(Container $container) {
+		return $this->resolve_value($container);
 	}
 }

plugins/woocommerce/packages/woocommerce-blocks/src/Utils/BlocksWpQuery.php

Indentation +68 added lines, -68 removed lines

@@ -12,79 +12,79 @@
  * @deprecated 2.5.0
  */
 class BlocksWpQuery extends WP_Query {
-	/**
-	 * Constructor.
-	 *
-	 * Sets up the WordPress query, if parameter is not empty.
-	 *
-	 * Unlike the constructor in WP_Query, this does not RUN the query.
-	 *
-	 * @param string|array $query URL query string or array of vars.
-	 */
-	public function __construct( $query = '' ) {
-		if ( ! empty( $query ) ) {
-			$this->init();
+    /**
+     * Constructor.
+     *
+     * Sets up the WordPress query, if parameter is not empty.
+     *
+     * Unlike the constructor in WP_Query, this does not RUN the query.
+     *
+     * @param string|array $query URL query string or array of vars.
+     */
+    public function __construct( $query = '' ) {
+        if ( ! empty( $query ) ) {
+            $this->init();
 
-			// Remove current product from query to avoid infinite loops and out of memory issues.
-			// That might happen if the store is using Gutenberg for product descriptions.
-			// See https://github.com/woocommerce/woocommerce-blocks/issues/6416.
-			global $post;
-			if ( $post && array_key_exists( 'post__in', $query ) && is_array( $query['post__in'] ) ) {
-				$global_post_id    = $post->ID;
-				$filtered_post__in = array_filter(
-					$query['post__in'],
-					static function ( $post_id ) use ( $global_post_id ) {
-						if ( $global_post_id === $post_id ) {
-							return false;
-						}
-						return true;
-					}
-				);
-				$query['post__in'] = $filtered_post__in;
-			}
+            // Remove current product from query to avoid infinite loops and out of memory issues.
+            // That might happen if the store is using Gutenberg for product descriptions.
+            // See https://github.com/woocommerce/woocommerce-blocks/issues/6416.
+            global $post;
+            if ( $post && array_key_exists( 'post__in', $query ) && is_array( $query['post__in'] ) ) {
+                $global_post_id    = $post->ID;
+                $filtered_post__in = array_filter(
+                    $query['post__in'],
+                    static function ( $post_id ) use ( $global_post_id ) {
+                        if ( $global_post_id === $post_id ) {
+                            return false;
+                        }
+                        return true;
+                    }
+                );
+                $query['post__in'] = $filtered_post__in;
+            }
 
-			$this->query      = wp_parse_args( $query );
-			$this->query_vars = $this->query;
-			$this->parse_query_vars();
-		}
-	}
+            $this->query      = wp_parse_args( $query );
+            $this->query_vars = $this->query;
+            $this->parse_query_vars();
+        }
+    }
 
-	/**
-	 * Get cached posts, if a cache exists.
-	 *
-	 * A hash is generated using the array of query_vars. If doing custom queries via filters such as posts_where
-	 * (where the SQL query is manipulated directly) you can still ensure there is a unique hash by injecting custom
-	 * query vars via the parse_query filter. For example:
-	 *
-	 *      add_filter( 'parse_query', function( $wp_query ) {
-	 *           $wp_query->query_vars['my_custom_query_var'] = true;
-	 *      } );
-	 *
-	 * Doing so won't have any negative effect on the query itself, and it will cause the hash to change.
-	 *
-	 * @param string $transient_version Transient version to allow for invalidation.
-	 * @return WP_Post[]|int[] Array of post objects or post IDs.
-	 */
-	public function get_cached_posts( $transient_version = '' ) {
-		$hash            = md5( wp_json_encode( $this->query_vars ) );
-		$transient_name  = 'wc_blocks_query_' . $hash;
-		$transient_value = get_transient( $transient_name );
+    /**
+     * Get cached posts, if a cache exists.
+     *
+     * A hash is generated using the array of query_vars. If doing custom queries via filters such as posts_where
+     * (where the SQL query is manipulated directly) you can still ensure there is a unique hash by injecting custom
+     * query vars via the parse_query filter. For example:
+     *
+     *      add_filter( 'parse_query', function( $wp_query ) {
+     *           $wp_query->query_vars['my_custom_query_var'] = true;
+     *      } );
+     *
+     * Doing so won't have any negative effect on the query itself, and it will cause the hash to change.
+     *
+     * @param string $transient_version Transient version to allow for invalidation.
+     * @return WP_Post[]|int[] Array of post objects or post IDs.
+     */
+    public function get_cached_posts( $transient_version = '' ) {
+        $hash            = md5( wp_json_encode( $this->query_vars ) );
+        $transient_name  = 'wc_blocks_query_' . $hash;
+        $transient_value = get_transient( $transient_name );
 
-		if ( isset( $transient_value, $transient_value['version'], $transient_value['value'] ) && $transient_value['version'] === $transient_version ) {
-			return $transient_value['value'];
-		}
+        if ( isset( $transient_value, $transient_value['version'], $transient_value['value'] ) && $transient_value['version'] === $transient_version ) {
+            return $transient_value['value'];
+        }
 
-		$results = $this->get_posts();
+        $results = $this->get_posts();
 
-		set_transient(
-			$transient_name,
-			array(
-				'version' => $transient_version,
-				'value'   => $results,
-			),
-			DAY_IN_SECONDS * 30
-		);
+        set_transient(
+            $transient_name,
+            array(
+                'version' => $transient_version,
+                'value'   => $results,
+            ),
+            DAY_IN_SECONDS * 30
+        );
 
-		return $results;
-	}
+        return $results;
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -21,20 +21,20 @@ 
 	 *
 	 * @param string|array $query URL query string or array of vars.
 	 */
-	public function __construct( $query = '' ) {
-		if ( ! empty( $query ) ) {
+	public function __construct($query = '') {
+		if (!empty($query)) {
 			$this->init();
 
 			// Remove current product from query to avoid infinite loops and out of memory issues.
 			// That might happen if the store is using Gutenberg for product descriptions.
 			// See https://github.com/woocommerce/woocommerce-blocks/issues/6416.
 			global $post;
-			if ( $post && array_key_exists( 'post__in', $query ) && is_array( $query['post__in'] ) ) {
+			if ($post && array_key_exists('post__in', $query) && is_array($query['post__in'])) {
 				$global_post_id    = $post->ID;
 				$filtered_post__in = array_filter(
 					$query['post__in'],
-					static function ( $post_id ) use ( $global_post_id ) {
-						if ( $global_post_id === $post_id ) {
+					static function($post_id) use ($global_post_id) {
+						if ($global_post_id === $post_id) {
 							return false;
 						}
 						return true;
@@ -43,7 +43,7 @@ 
 				$query['post__in'] = $filtered_post__in;
 			}
 
-			$this->query      = wp_parse_args( $query );
+			$this->query      = wp_parse_args($query);
 			$this->query_vars = $this->query;
 			$this->parse_query_vars();
 		}
@@ -65,12 +65,12 @@ 
 	 * @param string $transient_version Transient version to allow for invalidation.
 	 * @return WP_Post[]|int[] Array of post objects or post IDs.
 	 */
-	public function get_cached_posts( $transient_version = '' ) {
-		$hash            = md5( wp_json_encode( $this->query_vars ) );
+	public function get_cached_posts($transient_version = '') {
+		$hash            = md5(wp_json_encode($this->query_vars));
 		$transient_name  = 'wc_blocks_query_' . $hash;
-		$transient_value = get_transient( $transient_name );
+		$transient_value = get_transient($transient_name);
 
-		if ( isset( $transient_value, $transient_value['version'], $transient_value['value'] ) && $transient_value['version'] === $transient_version ) {
+		if (isset($transient_value, $transient_value['version'], $transient_value['value']) && $transient_value['version'] === $transient_version) {
 			return $transient_value['value'];
 		}
 

plugins/woocommerce/packages/woocommerce-blocks/src/Utils/StyleAttributesUtils.php

Indentation +413 added lines, -413 removed lines

@@ -6,417 +6,417 @@
  */
 class StyleAttributesUtils {
 
-	/**
-	 * Get class and style for font-size from attributes.
-	 *
-	 * @param array $attributes Block attributes.
-	 *
-	 * @return (array | null)
-	 */
-	public static function get_font_size_class_and_style( $attributes ) {
-
-		$font_size = $attributes['fontSize'] ?? '';
-
-		$custom_font_size = $attributes['style']['typography']['fontSize'] ?? '';
-
-		if ( ! $font_size && '' === $custom_font_size ) {
-			return null;
-		};
-
-		if ( $font_size ) {
-			return array(
-				'class' => sprintf( 'has-font-size has-%s-font-size', $font_size ),
-				'style' => null,
-			);
-		} elseif ( '' !== $custom_font_size ) {
-			return array(
-				'class' => null,
-				'style' => sprintf( 'font-size: %s;', $custom_font_size ),
-			);
-		}
-		return null;
-	}
-
-	/**
-	 * Get class and style for font-family from attributes.
-	 *
-	 * @param array $attributes Block attributes.
-	 *
-	 * @return (array | null)
-	 */
-	public static function get_font_family_class_and_style( $attributes ) {
-
-		$font_family = $attributes['fontFamily'] ?? '';
-
-		if ( $font_family ) {
-			return array(
-				'class' => sprintf( 'has-%s-font-family', $font_family ),
-				'style' => null,
-			);
-		}
-		return null;
-	}
-
-	/**
-	 * Get class and style for text-color from attributes.
-	 *
-	 * @param array $attributes Block attributes.
-	 *
-	 * @return (array | null)
-	 */
-	public static function get_text_color_class_and_style( $attributes ) {
-
-		$text_color = $attributes['textColor'] ?? '';
-
-		$custom_text_color = $attributes['style']['color']['text'] ?? '';
-
-		if ( ! $text_color && ! $custom_text_color ) {
-			return null;
-		};
-
-		if ( $text_color ) {
-			return array(
-				'class' => sprintf( 'has-text-color has-%s-color', $text_color ),
-				'style' => null,
-				'value' => self::get_preset_value( $text_color ),
-			);
-		} elseif ( $custom_text_color ) {
-			return array(
-				'class' => null,
-				'style' => sprintf( 'color: %s;', $custom_text_color ),
-				'value' => $custom_text_color,
-			);
-		}
-		return null;
-	}
-
-	/**
-	 * Get class and style for link-color from attributes.
-	 *
-	 * @param array $attributes Block attributes.
-	 *
-	 * @return (array | null)
-	 */
-	public static function get_link_color_class_and_style( $attributes ) {
-
-		if ( ! isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
-			return null;
-		};
-
-		$link_color = $attributes['style']['elements']['link']['color']['text'];
-
-		// If the link color is selected from the theme color picker, the value of $link_color is var:preset|color|slug.
-		// If the link color is selected from the core color picker, the value of $link_color is an hex value.
-		// When the link color is a string var:preset|color|slug we parsed it for get the slug, otherwise we use the hex value.
-		$index_named_link_color = strrpos( $link_color, '|' );
-
-		if ( ! empty( $index_named_link_color ) ) {
-			$parsed_named_link_color = substr( $link_color, $index_named_link_color + 1 );
-			return array(
-				'class' => null,
-				'style' => sprintf( 'color: %s;', self::get_preset_value( $parsed_named_link_color ) ),
-				'value' => self::get_preset_value( $parsed_named_link_color ),
-			);
-		} else {
-			return array(
-				'class' => null,
-				'style' => sprintf( 'color: %s;', $link_color ),
-				'value' => $link_color,
-			);
-		}
-	}
-
-	/**
-	 * Get class and style for line height from attributes.
-	 *
-	 * @param array $attributes Block attributes.
-	 *
-	 * @return (array | null)
-	 */
-	public static function get_line_height_class_and_style( $attributes ) {
-
-		$line_height = $attributes['style']['typography']['lineHeight'] ?? '';
-
-		if ( ! $line_height ) {
-			return null;
-		};
-
-		return array(
-			'class' => null,
-			'style' => sprintf( 'line-height: %s;', $line_height ),
-		);
-	}
-
-	/**
-	 * Get class and style for background-color from attributes.
-	 *
-	 * @param array $attributes Block attributes.
-	 *
-	 * @return (array | null)
-	 */
-	public static function get_background_color_class_and_style( $attributes ) {
-
-		$background_color = $attributes['backgroundColor'] ?? '';
-
-		$custom_background_color = $attributes['style']['color']['background'] ?? '';
-
-		if ( ! $background_color && '' === $custom_background_color ) {
-			return null;
-		};
-
-		if ( $background_color ) {
-			return array(
-				'class' => sprintf( 'has-background has-%s-background-color', $background_color ),
-				'style' => null,
-				'value' => self::get_preset_value( $background_color ),
-			);
-		} elseif ( '' !== $custom_background_color ) {
-			return array(
-				'class' => null,
-				'style' => sprintf( 'background-color: %s;', $custom_background_color ),
-				'value' => $custom_background_color,
-			);
-		}
-		return null;
-	}
-
-	/**
-	 * Get class and style for border-color from attributes.
-	 *
-	 * @param array $attributes Block attributes.
-	 *
-	 * @return (array | null)
-	 */
-	public static function get_border_color_class_and_style( $attributes ) {
-
-		$border_color = $attributes['borderColor'] ?? '';
-
-		$custom_border_color = $attributes['style']['border']['color'] ?? '';
-
-		if ( ! $border_color && '' === $custom_border_color ) {
-			return null;
-		};
-
-		if ( $border_color ) {
-			return array(
-				'class' => sprintf( 'has-border-color has-%s-border-color', $border_color ),
-				'style' => null,
-			);
-		} elseif ( '' !== $custom_border_color ) {
-			return array(
-				'class' => null,
-				'style' => sprintf( 'border-color: %s;', $custom_border_color ),
-			);
-		}
-		return null;
-	}
-
-	/**
-	 * Get class and style for border-radius from attributes.
-	 *
-	 * @param array $attributes Block attributes.
-	 *
-	 * @return (array | null)
-	 */
-	public static function get_border_radius_class_and_style( $attributes ) {
-
-		$custom_border_radius = $attributes['style']['border']['radius'] ?? '';
-
-		if ( '' === $custom_border_radius ) {
-			return null;
-		};
-
-		return array(
-			'class' => null,
-			'style' => sprintf( 'border-radius: %s;', $custom_border_radius ),
-		);
-	}
-
-	/**
-	 * Get class and style for border width from attributes.
-	 *
-	 * @param array $attributes Block attributes.
-	 *
-	 * @return (array | null)
-	 */
-	public static function get_border_width_class_and_style( $attributes ) {
-
-		$custom_border_width = $attributes['style']['border']['width'] ?? '';
-
-		if ( '' === $custom_border_width ) {
-			return null;
-		};
-
-		return array(
-			'class' => null,
-			'style' => sprintf( 'border-width: %s;', $custom_border_width ),
-		);
-	}
-
-	/**
-	 * Get class and style for align from attributes.
-	 *
-	 * @param array $attributes Block attributes.
-	 *
-	 * @return (array | null)
-	 */
-	public static function get_align_class_and_style( $attributes ) {
-
-		$align_attribute = isset( $attributes['align'] ) ? $attributes['align'] : null;
-
-		if ( ! $align_attribute ) {
-			return null;
-		};
-
-		if ( 'wide' === $align_attribute ) {
-			return array(
-				'class' => 'alignwide',
-				'style' => null,
-			);
-		}
-
-		if ( 'full' === $align_attribute ) {
-			return array(
-				'class' => 'alignfull',
-				'style' => null,
-			);
-		}
-
-		if ( 'left' === $align_attribute ) {
-			return array(
-				'class' => 'alignleft',
-				'style' => null,
-			);
-		}
-
-		if ( 'right' === $align_attribute ) {
-			return array(
-				'class' => 'alignright',
-				'style' => null,
-			);
-		}
-
-		if ( 'center' === $align_attribute ) {
-			return array(
-				'class' => 'aligncenter',
-				'style' => null,
-			);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get class and style for padding from attributes.
-	 *
-	 * @param array $attributes Block attributes.
-	 *
-	 * @return (array | null)
-	 */
-	public static function get_padding_class_and_style( $attributes ) {
-		$padding = isset( $attributes['style']['spacing']['padding'] ) ? $attributes['style']['spacing']['padding'] : null;
-
-		if ( ! $padding ) {
-			return null;
-		}
-
-		return array(
-			'class' => null,
-			'style' => sprintf( 'padding: %s;', implode( ' ', $padding ) ),
-		);
-	}
-
-	/**
-	 * Get classes and styles from attributes.
-	 *
-	 * @param array $attributes Block attributes.
-	 * @param array $properties Properties to get classes/styles from.
-	 *
-	 * @return array
-	 */
-	public static function get_classes_and_styles_by_attributes( $attributes, $properties = array() ) {
-		$classes_and_styles = array(
-			'line_height'      => self::get_line_height_class_and_style( $attributes ),
-			'text_color'       => self::get_text_color_class_and_style( $attributes ),
-			'font_size'        => self::get_font_size_class_and_style( $attributes ),
-			'font_family'      => self::get_font_family_class_and_style( $attributes ),
-			'link_color'       => self::get_link_color_class_and_style( $attributes ),
-			'background_color' => self::get_background_color_class_and_style( $attributes ),
-			'border_color'     => self::get_border_color_class_and_style( $attributes ),
-			'border_radius'    => self::get_border_radius_class_and_style( $attributes ),
-			'border_width'     => self::get_border_width_class_and_style( $attributes ),
-			'padding'          => self::get_padding_class_and_style( $attributes ),
-		);
-
-		if ( ! empty( $properties ) ) {
-			foreach ( $classes_and_styles as $key => $value ) {
-				if ( ! in_array( $key, $properties, true ) ) {
-					unset( $classes_and_styles[ $key ] );
-				}
-			}
-		}
-
-		$classes_and_styles = array_filter( $classes_and_styles );
-
-		$classes = array_map(
-			function( $item ) {
-				return $item['class'];
-			},
-			$classes_and_styles
-		);
-
-		$styles = array_map(
-			function( $item ) {
-				return $item['style'];
-			},
-			$classes_and_styles
-		);
-
-		$classes = array_filter( $classes );
-		$styles  = array_filter( $styles );
-
-		return array(
-			'classes' => implode( ' ', $classes ),
-			'styles'  => implode( ' ', $styles ),
-		);
-	}
-
-	/**
-	 * Get space-separated classes from block attributes.
-	 *
-	 * @param array $attributes Block attributes.
-	 * @param array $properties Properties to get classes from.
-	 *
-	 * @return string Space-separated classes.
-	 */
-	public static function get_classes_by_attributes( $attributes, $properties = array() ) {
-		$classes_and_styles = self::get_classes_and_styles_by_attributes( $attributes, $properties );
-
-		return $classes_and_styles['classes'];
-	}
-
-	/**
-	 * Get space-separated style rules from block attributes.
-	 *
-	 * @param array $attributes Block attributes.
-	 * @param array $properties Properties to get styles from.
-	 *
-	 * @return string Space-separated style rules.
-	 */
-	public static function get_styles_by_attributes( $attributes, $properties = array() ) {
-		$classes_and_styles = self::get_classes_and_styles_by_attributes( $attributes, $properties );
-
-		return $classes_and_styles['styles'];
-	}
-
-	/**
-	 * Get CSS value for color preset.
-	 *
-	 * @param string $preset_name Preset name.
-	 *
-	 * @return string CSS value for color preset.
-	 */
-	public static function get_preset_value( $preset_name ) {
-		return "var(--wp--preset--color--$preset_name)";
-	}
+    /**
+     * Get class and style for font-size from attributes.
+     *
+     * @param array $attributes Block attributes.
+     *
+     * @return (array | null)
+     */
+    public static function get_font_size_class_and_style( $attributes ) {
+
+        $font_size = $attributes['fontSize'] ?? '';
+
+        $custom_font_size = $attributes['style']['typography']['fontSize'] ?? '';
+
+        if ( ! $font_size && '' === $custom_font_size ) {
+            return null;
+        };
+
+        if ( $font_size ) {
+            return array(
+                'class' => sprintf( 'has-font-size has-%s-font-size', $font_size ),
+                'style' => null,
+            );
+        } elseif ( '' !== $custom_font_size ) {
+            return array(
+                'class' => null,
+                'style' => sprintf( 'font-size: %s;', $custom_font_size ),
+            );
+        }
+        return null;
+    }
+
+    /**
+     * Get class and style for font-family from attributes.
+     *
+     * @param array $attributes Block attributes.
+     *
+     * @return (array | null)
+     */
+    public static function get_font_family_class_and_style( $attributes ) {
+
+        $font_family = $attributes['fontFamily'] ?? '';
+
+        if ( $font_family ) {
+            return array(
+                'class' => sprintf( 'has-%s-font-family', $font_family ),
+                'style' => null,
+            );
+        }
+        return null;
+    }
+
+    /**
+     * Get class and style for text-color from attributes.
+     *
+     * @param array $attributes Block attributes.
+     *
+     * @return (array | null)
+     */
+    public static function get_text_color_class_and_style( $attributes ) {
+
+        $text_color = $attributes['textColor'] ?? '';
+
+        $custom_text_color = $attributes['style']['color']['text'] ?? '';
+
+        if ( ! $text_color && ! $custom_text_color ) {
+            return null;
+        };
+
+        if ( $text_color ) {
+            return array(
+                'class' => sprintf( 'has-text-color has-%s-color', $text_color ),
+                'style' => null,
+                'value' => self::get_preset_value( $text_color ),
+            );
+        } elseif ( $custom_text_color ) {
+            return array(
+                'class' => null,
+                'style' => sprintf( 'color: %s;', $custom_text_color ),
+                'value' => $custom_text_color,
+            );
+        }
+        return null;
+    }
+
+    /**
+     * Get class and style for link-color from attributes.
+     *
+     * @param array $attributes Block attributes.
+     *
+     * @return (array | null)
+     */
+    public static function get_link_color_class_and_style( $attributes ) {
+
+        if ( ! isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+            return null;
+        };
+
+        $link_color = $attributes['style']['elements']['link']['color']['text'];
+
+        // If the link color is selected from the theme color picker, the value of $link_color is var:preset|color|slug.
+        // If the link color is selected from the core color picker, the value of $link_color is an hex value.
+        // When the link color is a string var:preset|color|slug we parsed it for get the slug, otherwise we use the hex value.
+        $index_named_link_color = strrpos( $link_color, '|' );
+
+        if ( ! empty( $index_named_link_color ) ) {
+            $parsed_named_link_color = substr( $link_color, $index_named_link_color + 1 );
+            return array(
+                'class' => null,
+                'style' => sprintf( 'color: %s;', self::get_preset_value( $parsed_named_link_color ) ),
+                'value' => self::get_preset_value( $parsed_named_link_color ),
+            );
+        } else {
+            return array(
+                'class' => null,
+                'style' => sprintf( 'color: %s;', $link_color ),
+                'value' => $link_color,
+            );
+        }
+    }
+
+    /**
+     * Get class and style for line height from attributes.
+     *
+     * @param array $attributes Block attributes.
+     *
+     * @return (array | null)
+     */
+    public static function get_line_height_class_and_style( $attributes ) {
+
+        $line_height = $attributes['style']['typography']['lineHeight'] ?? '';
+
+        if ( ! $line_height ) {
+            return null;
+        };
+
+        return array(
+            'class' => null,
+            'style' => sprintf( 'line-height: %s;', $line_height ),
+        );
+    }
+
+    /**
+     * Get class and style for background-color from attributes.
+     *
+     * @param array $attributes Block attributes.
+     *
+     * @return (array | null)
+     */
+    public static function get_background_color_class_and_style( $attributes ) {
+
+        $background_color = $attributes['backgroundColor'] ?? '';
+
+        $custom_background_color = $attributes['style']['color']['background'] ?? '';
+
+        if ( ! $background_color && '' === $custom_background_color ) {
+            return null;
+        };
+
+        if ( $background_color ) {
+            return array(
+                'class' => sprintf( 'has-background has-%s-background-color', $background_color ),
+                'style' => null,
+                'value' => self::get_preset_value( $background_color ),
+            );
+        } elseif ( '' !== $custom_background_color ) {
+            return array(
+                'class' => null,
+                'style' => sprintf( 'background-color: %s;', $custom_background_color ),
+                'value' => $custom_background_color,
+            );
+        }
+        return null;
+    }
+
+    /**
+     * Get class and style for border-color from attributes.
+     *
+     * @param array $attributes Block attributes.
+     *
+     * @return (array | null)
+     */
+    public static function get_border_color_class_and_style( $attributes ) {
+
+        $border_color = $attributes['borderColor'] ?? '';
+
+        $custom_border_color = $attributes['style']['border']['color'] ?? '';
+
+        if ( ! $border_color && '' === $custom_border_color ) {
+            return null;
+        };
+
+        if ( $border_color ) {
+            return array(
+                'class' => sprintf( 'has-border-color has-%s-border-color', $border_color ),
+                'style' => null,
+            );
+        } elseif ( '' !== $custom_border_color ) {
+            return array(
+                'class' => null,
+                'style' => sprintf( 'border-color: %s;', $custom_border_color ),
+            );
+        }
+        return null;
+    }
+
+    /**
+     * Get class and style for border-radius from attributes.
+     *
+     * @param array $attributes Block attributes.
+     *
+     * @return (array | null)
+     */
+    public static function get_border_radius_class_and_style( $attributes ) {
+
+        $custom_border_radius = $attributes['style']['border']['radius'] ?? '';
+
+        if ( '' === $custom_border_radius ) {
+            return null;
+        };
+
+        return array(
+            'class' => null,
+            'style' => sprintf( 'border-radius: %s;', $custom_border_radius ),
+        );
+    }
+
+    /**
+     * Get class and style for border width from attributes.
+     *
+     * @param array $attributes Block attributes.
+     *
+     * @return (array | null)
+     */
+    public static function get_border_width_class_and_style( $attributes ) {
+
+        $custom_border_width = $attributes['style']['border']['width'] ?? '';
+
+        if ( '' === $custom_border_width ) {
+            return null;
+        };
+
+        return array(
+            'class' => null,
+            'style' => sprintf( 'border-width: %s;', $custom_border_width ),
+        );
+    }
+
+    /**
+     * Get class and style for align from attributes.
+     *
+     * @param array $attributes Block attributes.
+     *
+     * @return (array | null)
+     */
+    public static function get_align_class_and_style( $attributes ) {
+
+        $align_attribute = isset( $attributes['align'] ) ? $attributes['align'] : null;
+
+        if ( ! $align_attribute ) {
+            return null;
+        };
+
+        if ( 'wide' === $align_attribute ) {
+            return array(
+                'class' => 'alignwide',
+                'style' => null,
+            );
+        }
+
+        if ( 'full' === $align_attribute ) {
+            return array(
+                'class' => 'alignfull',
+                'style' => null,
+            );
+        }
+
+        if ( 'left' === $align_attribute ) {
+            return array(
+                'class' => 'alignleft',
+                'style' => null,
+            );
+        }
+
+        if ( 'right' === $align_attribute ) {
+            return array(
+                'class' => 'alignright',
+                'style' => null,
+            );
+        }
+
+        if ( 'center' === $align_attribute ) {
+            return array(
+                'class' => 'aligncenter',
+                'style' => null,
+            );
+        }
+
+        return null;
+    }
+
+    /**
+     * Get class and style for padding from attributes.
+     *
+     * @param array $attributes Block attributes.
+     *
+     * @return (array | null)
+     */
+    public static function get_padding_class_and_style( $attributes ) {
+        $padding = isset( $attributes['style']['spacing']['padding'] ) ? $attributes['style']['spacing']['padding'] : null;
+
+        if ( ! $padding ) {
+            return null;
+        }
+
+        return array(
+            'class' => null,
+            'style' => sprintf( 'padding: %s;', implode( ' ', $padding ) ),
+        );
+    }
+
+    /**
+     * Get classes and styles from attributes.
+     *
+     * @param array $attributes Block attributes.
+     * @param array $properties Properties to get classes/styles from.
+     *
+     * @return array
+     */
+    public static function get_classes_and_styles_by_attributes( $attributes, $properties = array() ) {
+        $classes_and_styles = array(
+            'line_height'      => self::get_line_height_class_and_style( $attributes ),
+            'text_color'       => self::get_text_color_class_and_style( $attributes ),
+            'font_size'        => self::get_font_size_class_and_style( $attributes ),
+            'font_family'      => self::get_font_family_class_and_style( $attributes ),
+            'link_color'       => self::get_link_color_class_and_style( $attributes ),
+            'background_color' => self::get_background_color_class_and_style( $attributes ),
+            'border_color'     => self::get_border_color_class_and_style( $attributes ),
+            'border_radius'    => self::get_border_radius_class_and_style( $attributes ),
+            'border_width'     => self::get_border_width_class_and_style( $attributes ),
+            'padding'          => self::get_padding_class_and_style( $attributes ),
+        );
+
+        if ( ! empty( $properties ) ) {
+            foreach ( $classes_and_styles as $key => $value ) {
+                if ( ! in_array( $key, $properties, true ) ) {
+                    unset( $classes_and_styles[ $key ] );
+                }
+            }
+        }
+
+        $classes_and_styles = array_filter( $classes_and_styles );
+
+        $classes = array_map(
+            function( $item ) {
+                return $item['class'];
+            },
+            $classes_and_styles
+        );
+
+        $styles = array_map(
+            function( $item ) {
+                return $item['style'];
+            },
+            $classes_and_styles
+        );
+
+        $classes = array_filter( $classes );
+        $styles  = array_filter( $styles );
+
+        return array(
+            'classes' => implode( ' ', $classes ),
+            'styles'  => implode( ' ', $styles ),
+        );
+    }
+
+    /**
+     * Get space-separated classes from block attributes.
+     *
+     * @param array $attributes Block attributes.
+     * @param array $properties Properties to get classes from.
+     *
+     * @return string Space-separated classes.
+     */
+    public static function get_classes_by_attributes( $attributes, $properties = array() ) {
+        $classes_and_styles = self::get_classes_and_styles_by_attributes( $attributes, $properties );
+
+        return $classes_and_styles['classes'];
+    }
+
+    /**
+     * Get space-separated style rules from block attributes.
+     *
+     * @param array $attributes Block attributes.
+     * @param array $properties Properties to get styles from.
+     *
+     * @return string Space-separated style rules.
+     */
+    public static function get_styles_by_attributes( $attributes, $properties = array() ) {
+        $classes_and_styles = self::get_classes_and_styles_by_attributes( $attributes, $properties );
+
+        return $classes_and_styles['styles'];
+    }
+
+    /**
+     * Get CSS value for color preset.
+     *
+     * @param string $preset_name Preset name.
+     *
+     * @return string CSS value for color preset.
+     */
+    public static function get_preset_value( $preset_name ) {
+        return "var(--wp--preset--color--$preset_name)";
+    }
 }

Spacing +85 added lines, -85 removed lines

@@ -13,25 +13,25 @@ 
 	 *
 	 * @return (array | null)
 	 */
-	public static function get_font_size_class_and_style( $attributes ) {
+	public static function get_font_size_class_and_style($attributes) {
 
 		$font_size = $attributes['fontSize'] ?? '';
 
 		$custom_font_size = $attributes['style']['typography']['fontSize'] ?? '';
 
-		if ( ! $font_size && '' === $custom_font_size ) {
+		if (!$font_size && '' === $custom_font_size) {
 			return null;
 		};
 
-		if ( $font_size ) {
+		if ($font_size) {
 			return array(
-				'class' => sprintf( 'has-font-size has-%s-font-size', $font_size ),
+				'class' => sprintf('has-font-size has-%s-font-size', $font_size),
 				'style' => null,
 			);
-		} elseif ( '' !== $custom_font_size ) {
+		} elseif ('' !== $custom_font_size) {
 			return array(
 				'class' => null,
-				'style' => sprintf( 'font-size: %s;', $custom_font_size ),
+				'style' => sprintf('font-size: %s;', $custom_font_size),
 			);
 		}
 		return null;
@@ -44,13 +44,13 @@ 
 	 *
 	 * @return (array | null)
 	 */
-	public static function get_font_family_class_and_style( $attributes ) {
+	public static function get_font_family_class_and_style($attributes) {
 
 		$font_family = $attributes['fontFamily'] ?? '';
 
-		if ( $font_family ) {
+		if ($font_family) {
 			return array(
-				'class' => sprintf( 'has-%s-font-family', $font_family ),
+				'class' => sprintf('has-%s-font-family', $font_family),
 				'style' => null,
 			);
 		}
@@ -64,26 +64,26 @@ 
 	 *
 	 * @return (array | null)
 	 */
-	public static function get_text_color_class_and_style( $attributes ) {
+	public static function get_text_color_class_and_style($attributes) {
 
 		$text_color = $attributes['textColor'] ?? '';
 
 		$custom_text_color = $attributes['style']['color']['text'] ?? '';
 
-		if ( ! $text_color && ! $custom_text_color ) {
+		if (!$text_color && !$custom_text_color) {
 			return null;
 		};
 
-		if ( $text_color ) {
+		if ($text_color) {
 			return array(
-				'class' => sprintf( 'has-text-color has-%s-color', $text_color ),
+				'class' => sprintf('has-text-color has-%s-color', $text_color),
 				'style' => null,
-				'value' => self::get_preset_value( $text_color ),
+				'value' => self::get_preset_value($text_color),
 			);
-		} elseif ( $custom_text_color ) {
+		} elseif ($custom_text_color) {
 			return array(
 				'class' => null,
-				'style' => sprintf( 'color: %s;', $custom_text_color ),
+				'style' => sprintf('color: %s;', $custom_text_color),
 				'value' => $custom_text_color,
 			);
 		}
@@ -97,9 +97,9 @@ 
 	 *
 	 * @return (array | null)
 	 */
-	public static function get_link_color_class_and_style( $attributes ) {
+	public static function get_link_color_class_and_style($attributes) {
 
-		if ( ! isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		if (!isset($attributes['style']['elements']['link']['color']['text'])) {
 			return null;
 		};
 
@@ -108,19 +108,19 @@ 
 		// If the link color is selected from the theme color picker, the value of $link_color is var:preset|color|slug.
 		// If the link color is selected from the core color picker, the value of $link_color is an hex value.
 		// When the link color is a string var:preset|color|slug we parsed it for get the slug, otherwise we use the hex value.
-		$index_named_link_color = strrpos( $link_color, '|' );
+		$index_named_link_color = strrpos($link_color, '|');
 
-		if ( ! empty( $index_named_link_color ) ) {
-			$parsed_named_link_color = substr( $link_color, $index_named_link_color + 1 );
+		if (!empty($index_named_link_color)) {
+			$parsed_named_link_color = substr($link_color, $index_named_link_color + 1);
 			return array(
 				'class' => null,
-				'style' => sprintf( 'color: %s;', self::get_preset_value( $parsed_named_link_color ) ),
-				'value' => self::get_preset_value( $parsed_named_link_color ),
+				'style' => sprintf('color: %s;', self::get_preset_value($parsed_named_link_color)),
+				'value' => self::get_preset_value($parsed_named_link_color),
 			);
 		} else {
 			return array(
 				'class' => null,
-				'style' => sprintf( 'color: %s;', $link_color ),
+				'style' => sprintf('color: %s;', $link_color),
 				'value' => $link_color,
 			);
 		}
@@ -133,17 +133,17 @@ 
 	 *
 	 * @return (array | null)
 	 */
-	public static function get_line_height_class_and_style( $attributes ) {
+	public static function get_line_height_class_and_style($attributes) {
 
 		$line_height = $attributes['style']['typography']['lineHeight'] ?? '';
 
-		if ( ! $line_height ) {
+		if (!$line_height) {
 			return null;
 		};
 
 		return array(
 			'class' => null,
-			'style' => sprintf( 'line-height: %s;', $line_height ),
+			'style' => sprintf('line-height: %s;', $line_height),
 		);
 	}
 
@@ -154,26 +154,26 @@ 
 	 *
 	 * @return (array | null)
 	 */
-	public static function get_background_color_class_and_style( $attributes ) {
+	public static function get_background_color_class_and_style($attributes) {
 
 		$background_color = $attributes['backgroundColor'] ?? '';
 
 		$custom_background_color = $attributes['style']['color']['background'] ?? '';
 
-		if ( ! $background_color && '' === $custom_background_color ) {
+		if (!$background_color && '' === $custom_background_color) {
 			return null;
 		};
 
-		if ( $background_color ) {
+		if ($background_color) {
 			return array(
-				'class' => sprintf( 'has-background has-%s-background-color', $background_color ),
+				'class' => sprintf('has-background has-%s-background-color', $background_color),
 				'style' => null,
-				'value' => self::get_preset_value( $background_color ),
+				'value' => self::get_preset_value($background_color),
 			);
-		} elseif ( '' !== $custom_background_color ) {
+		} elseif ('' !== $custom_background_color) {
 			return array(
 				'class' => null,
-				'style' => sprintf( 'background-color: %s;', $custom_background_color ),
+				'style' => sprintf('background-color: %s;', $custom_background_color),
 				'value' => $custom_background_color,
 			);
 		}
@@ -187,25 +187,25 @@ 
 	 *
 	 * @return (array | null)
 	 */
-	public static function get_border_color_class_and_style( $attributes ) {
+	public static function get_border_color_class_and_style($attributes) {
 
 		$border_color = $attributes['borderColor'] ?? '';
 
 		$custom_border_color = $attributes['style']['border']['color'] ?? '';
 
-		if ( ! $border_color && '' === $custom_border_color ) {
+		if (!$border_color && '' === $custom_border_color) {
 			return null;
 		};
 
-		if ( $border_color ) {
+		if ($border_color) {
 			return array(
-				'class' => sprintf( 'has-border-color has-%s-border-color', $border_color ),
+				'class' => sprintf('has-border-color has-%s-border-color', $border_color),
 				'style' => null,
 			);
-		} elseif ( '' !== $custom_border_color ) {
+		} elseif ('' !== $custom_border_color) {
 			return array(
 				'class' => null,
-				'style' => sprintf( 'border-color: %s;', $custom_border_color ),
+				'style' => sprintf('border-color: %s;', $custom_border_color),
 			);
 		}
 		return null;
@@ -218,17 +218,17 @@ 
 	 *
 	 * @return (array | null)
 	 */
-	public static function get_border_radius_class_and_style( $attributes ) {
+	public static function get_border_radius_class_and_style($attributes) {
 
 		$custom_border_radius = $attributes['style']['border']['radius'] ?? '';
 
-		if ( '' === $custom_border_radius ) {
+		if ('' === $custom_border_radius) {
 			return null;
 		};
 
 		return array(
 			'class' => null,
-			'style' => sprintf( 'border-radius: %s;', $custom_border_radius ),
+			'style' => sprintf('border-radius: %s;', $custom_border_radius),
 		);
 	}
 
@@ -239,17 +239,17 @@ 
 	 *
 	 * @return (array | null)
 	 */
-	public static function get_border_width_class_and_style( $attributes ) {
+	public static function get_border_width_class_and_style($attributes) {
 
 		$custom_border_width = $attributes['style']['border']['width'] ?? '';
 
-		if ( '' === $custom_border_width ) {
+		if ('' === $custom_border_width) {
 			return null;
 		};
 
 		return array(
 			'class' => null,
-			'style' => sprintf( 'border-width: %s;', $custom_border_width ),
+			'style' => sprintf('border-width: %s;', $custom_border_width),
 		);
 	}
 
@@ -260,43 +260,43 @@ 
 	 *
 	 * @return (array | null)
 	 */
-	public static function get_align_class_and_style( $attributes ) {
+	public static function get_align_class_and_style($attributes) {
 
-		$align_attribute = isset( $attributes['align'] ) ? $attributes['align'] : null;
+		$align_attribute = isset($attributes['align']) ? $attributes['align'] : null;
 
-		if ( ! $align_attribute ) {
+		if (!$align_attribute) {
 			return null;
 		};
 
-		if ( 'wide' === $align_attribute ) {
+		if ('wide' === $align_attribute) {
 			return array(
 				'class' => 'alignwide',
 				'style' => null,
 			);
 		}
 
-		if ( 'full' === $align_attribute ) {
+		if ('full' === $align_attribute) {
 			return array(
 				'class' => 'alignfull',
 				'style' => null,
 			);
 		}
 
-		if ( 'left' === $align_attribute ) {
+		if ('left' === $align_attribute) {
 			return array(
 				'class' => 'alignleft',
 				'style' => null,
 			);
 		}
 
-		if ( 'right' === $align_attribute ) {
+		if ('right' === $align_attribute) {
 			return array(
 				'class' => 'alignright',
 				'style' => null,
 			);
 		}
 
-		if ( 'center' === $align_attribute ) {
+		if ('center' === $align_attribute) {
 			return array(
 				'class' => 'aligncenter',
 				'style' => null,
@@ -313,16 +313,16 @@ 
 	 *
 	 * @return (array | null)
 	 */
-	public static function get_padding_class_and_style( $attributes ) {
-		$padding = isset( $attributes['style']['spacing']['padding'] ) ? $attributes['style']['spacing']['padding'] : null;
+	public static function get_padding_class_and_style($attributes) {
+		$padding = isset($attributes['style']['spacing']['padding']) ? $attributes['style']['spacing']['padding'] : null;
 
-		if ( ! $padding ) {
+		if (!$padding) {
 			return null;
 		}
 
 		return array(
 			'class' => null,
-			'style' => sprintf( 'padding: %s;', implode( ' ', $padding ) ),
+			'style' => sprintf('padding: %s;', implode(' ', $padding)),
 		);
 	}
 
@@ -334,50 +334,50 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_classes_and_styles_by_attributes( $attributes, $properties = array() ) {
+	public static function get_classes_and_styles_by_attributes($attributes, $properties = array()) {
 		$classes_and_styles = array(
-			'line_height'      => self::get_line_height_class_and_style( $attributes ),
-			'text_color'       => self::get_text_color_class_and_style( $attributes ),
-			'font_size'        => self::get_font_size_class_and_style( $attributes ),
-			'font_family'      => self::get_font_family_class_and_style( $attributes ),
-			'link_color'       => self::get_link_color_class_and_style( $attributes ),
-			'background_color' => self::get_background_color_class_and_style( $attributes ),
-			'border_color'     => self::get_border_color_class_and_style( $attributes ),
-			'border_radius'    => self::get_border_radius_class_and_style( $attributes ),
-			'border_width'     => self::get_border_width_class_and_style( $attributes ),
-			'padding'          => self::get_padding_class_and_style( $attributes ),
+			'line_height'      => self::get_line_height_class_and_style($attributes),
+			'text_color'       => self::get_text_color_class_and_style($attributes),
+			'font_size'        => self::get_font_size_class_and_style($attributes),
+			'font_family'      => self::get_font_family_class_and_style($attributes),
+			'link_color'       => self::get_link_color_class_and_style($attributes),
+			'background_color' => self::get_background_color_class_and_style($attributes),
+			'border_color'     => self::get_border_color_class_and_style($attributes),
+			'border_radius'    => self::get_border_radius_class_and_style($attributes),
+			'border_width'     => self::get_border_width_class_and_style($attributes),
+			'padding'          => self::get_padding_class_and_style($attributes),
 		);
 
-		if ( ! empty( $properties ) ) {
-			foreach ( $classes_and_styles as $key => $value ) {
-				if ( ! in_array( $key, $properties, true ) ) {
-					unset( $classes_and_styles[ $key ] );
+		if (!empty($properties)) {
+			foreach ($classes_and_styles as $key => $value) {
+				if (!in_array($key, $properties, true)) {
+					unset($classes_and_styles[$key]);
 				}
 			}
 		}
 
-		$classes_and_styles = array_filter( $classes_and_styles );
+		$classes_and_styles = array_filter($classes_and_styles);
 
 		$classes = array_map(
-			function( $item ) {
+			function($item) {
 				return $item['class'];
 			},
 			$classes_and_styles
 		);
 
 		$styles = array_map(
-			function( $item ) {
+			function($item) {
 				return $item['style'];
 			},
 			$classes_and_styles
 		);
 
-		$classes = array_filter( $classes );
-		$styles  = array_filter( $styles );
+		$classes = array_filter($classes);
+		$styles  = array_filter($styles);
 
 		return array(
-			'classes' => implode( ' ', $classes ),
-			'styles'  => implode( ' ', $styles ),
+			'classes' => implode(' ', $classes),
+			'styles'  => implode(' ', $styles),
 		);
 	}
 
@@ -389,8 +389,8 @@ 
 	 *
 	 * @return string Space-separated classes.
 	 */
-	public static function get_classes_by_attributes( $attributes, $properties = array() ) {
-		$classes_and_styles = self::get_classes_and_styles_by_attributes( $attributes, $properties );
+	public static function get_classes_by_attributes($attributes, $properties = array()) {
+		$classes_and_styles = self::get_classes_and_styles_by_attributes($attributes, $properties);
 
 		return $classes_and_styles['classes'];
 	}
@@ -403,8 +403,8 @@ 
 	 *
 	 * @return string Space-separated style rules.
 	 */
-	public static function get_styles_by_attributes( $attributes, $properties = array() ) {
-		$classes_and_styles = self::get_classes_and_styles_by_attributes( $attributes, $properties );
+	public static function get_styles_by_attributes($attributes, $properties = array()) {
+		$classes_and_styles = self::get_classes_and_styles_by_attributes($attributes, $properties);
 
 		return $classes_and_styles['styles'];
 	}
@@ -416,7 +416,7 @@ 
 	 *
 	 * @return string CSS value for color preset.
 	 */
-	public static function get_preset_value( $preset_name ) {
+	public static function get_preset_value($preset_name) {
 		return "var(--wp--preset--color--$preset_name)";
 	}
 }

plugins/woocommerce/packages/woocommerce-blocks/src/Utils/BlockTemplateUtils.php

Indentation +554 added lines, -554 removed lines

@@ -10,558 +10,558 @@
  * {@internal This class and its methods should only be used within the BlockTemplateController.php and is not intended for public use.}
  */
 class BlockTemplateUtils {
-	/**
-	 * Directory names for block templates
-	 *
-	 * Directory names conventions for block templates have changed with Gutenberg 12.1.0,
-	 * however, for backwards-compatibility, we also keep the older conventions, prefixed
-	 * with `DEPRECATED_`.
-	 *
-	 * @var array {
-	 *     @var string DEPRECATED_TEMPLATES  Old directory name of the block templates directory.
-	 *     @var string DEPRECATED_TEMPLATE_PARTS  Old directory name of the block template parts directory.
-	 *     @var string TEMPLATES_DIR_NAME  Directory name of the block templates directory.
-	 *     @var string TEMPLATE_PARTS_DIR_NAME  Directory name of the block template parts directory.
-	 * }
-	 */
-	const DIRECTORY_NAMES = array(
-		'DEPRECATED_TEMPLATES'      => 'block-templates',
-		'DEPRECATED_TEMPLATE_PARTS' => 'block-template-parts',
-		'TEMPLATES'                 => 'templates',
-		'TEMPLATE_PARTS'            => 'parts',
-	);
-
-	/**
-	 * WooCommerce plugin slug
-	 *
-	 * This is used to save templates to the DB which are stored against this value in the wp_terms table.
-	 *
-	 * @var string
-	 */
-	const PLUGIN_SLUG = 'woocommerce/woocommerce';
-
-	/**
-	 * Deprecated WooCommerce plugin slug
-	 *
-	 * For supporting users who have customized templates under the incorrect plugin slug during the first release.
-	 * More context found here: https://github.com/woocommerce/woocommerce-gutenberg-products-block/issues/5423.
-	 *
-	 * @var string
-	 */
-	const DEPRECATED_PLUGIN_SLUG = 'woocommerce';
-
-	/**
-	 * Returns an array containing the references of
-	 * the passed blocks and their inner blocks.
-	 *
-	 * @param array $blocks array of blocks.
-	 *
-	 * @return array block references to the passed blocks and their inner blocks.
-	 */
-	public static function flatten_blocks( &$blocks ) {
-		$all_blocks = array();
-		$queue      = array();
-		foreach ( $blocks as &$block ) {
-			$queue[] = &$block;
-		}
-		$queue_count = count( $queue );
-
-		while ( $queue_count > 0 ) {
-			$block = &$queue[0];
-			array_shift( $queue );
-			$all_blocks[] = &$block;
-
-			if ( ! empty( $block['innerBlocks'] ) ) {
-				foreach ( $block['innerBlocks'] as &$inner_block ) {
-					$queue[] = &$inner_block;
-				}
-			}
-
-			$queue_count = count( $queue );
-		}
-
-		return $all_blocks;
-	}
-
-	/**
-	 * Parses wp_template content and injects the current theme's
-	 * stylesheet as a theme attribute into each wp_template_part
-	 *
-	 * @param string $template_content serialized wp_template content.
-	 *
-	 * @return string Updated wp_template content.
-	 */
-	public static function inject_theme_attribute_in_content( $template_content ) {
-		$has_updated_content = false;
-		$new_content         = '';
-		$template_blocks     = parse_blocks( $template_content );
-
-		$blocks = self::flatten_blocks( $template_blocks );
-		foreach ( $blocks as &$block ) {
-			if (
-				'core/template-part' === $block['blockName'] &&
-				! isset( $block['attrs']['theme'] )
-			) {
-				$block['attrs']['theme'] = wp_get_theme()->get_stylesheet();
-				$has_updated_content     = true;
-			}
-		}
-
-		if ( $has_updated_content ) {
-			foreach ( $template_blocks as &$block ) {
-				$new_content .= serialize_block( $block );
-			}
-
-			return $new_content;
-		}
-
-		return $template_content;
-	}
-
-	/**
-	 * Build a unified template object based a post Object.
-	 * Important: This method is an almost identical duplicate from wp-includes/block-template-utils.php as it was not intended for public use. It has been modified to build templates from plugins rather than themes.
-	 *
-	 * @param \WP_Post $post Template post.
-	 *
-	 * @return \WP_Block_Template|\WP_Error Template.
-	 */
-	public static function build_template_result_from_post( $post ) {
-		$terms = get_the_terms( $post, 'wp_theme' );
-
-		if ( is_wp_error( $terms ) ) {
-			return $terms;
-		}
-
-		if ( ! $terms ) {
-			return new \WP_Error( 'template_missing_theme', __( 'No theme is defined for this template.', 'woocommerce' ) );
-		}
-
-		$theme          = $terms[0]->name;
-		$has_theme_file = true;
-
-		$template                 = new \WP_Block_Template();
-		$template->wp_id          = $post->ID;
-		$template->id             = $theme . '//' . $post->post_name;
-		$template->theme          = $theme;
-		$template->content        = $post->post_content;
-		$template->slug           = $post->post_name;
-		$template->source         = 'custom';
-		$template->type           = $post->post_type;
-		$template->description    = $post->post_excerpt;
-		$template->title          = $post->post_title;
-		$template->status         = $post->post_status;
-		$template->has_theme_file = $has_theme_file;
-		$template->is_custom      = false;
-		$template->post_types     = array(); // Don't appear in any Edit Post template selector dropdown.
-
-		if ( 'wp_template_part' === $post->post_type ) {
-			$type_terms = get_the_terms( $post, 'wp_template_part_area' );
-			if ( ! is_wp_error( $type_terms ) && false !== $type_terms ) {
-				$template->area = $type_terms[0]->name;
-			}
-		}
-
-		// We are checking 'woocommerce' to maintain classic templates which are saved to the DB,
-		// prior to updating to use the correct slug.
-		// More information found here: https://github.com/woocommerce/woocommerce-gutenberg-products-block/issues/5423.
-		if ( self::PLUGIN_SLUG === $theme || self::DEPRECATED_PLUGIN_SLUG === strtolower( $theme ) ) {
-			$template->origin = 'plugin';
-		}
-
-		return $template;
-	}
-
-	/**
-	 * Build a unified template object based on a theme file.
-	 * Important: This method is an almost identical duplicate from wp-includes/block-template-utils.php as it was not intended for public use. It has been modified to build templates from plugins rather than themes.
-	 *
-	 * @param array|object $template_file Theme file.
-	 * @param string       $template_type wp_template or wp_template_part.
-	 *
-	 * @return \WP_Block_Template Template.
-	 */
-	public static function build_template_result_from_file( $template_file, $template_type ) {
-		$template_file = (object) $template_file;
-
-		// If the theme has an archive-products.html template but does not have product taxonomy templates
-		// then we will load in the archive-product.html template from the theme to use for product taxonomies on the frontend.
-		$template_is_from_theme = 'theme' === $template_file->source;
-		$theme_name             = wp_get_theme()->get( 'TextDomain' );
-
-		// phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
-		$template_content  = file_get_contents( $template_file->path );
-		$template          = new \WP_Block_Template();
-		$template->id      = $template_is_from_theme ? $theme_name . '//' . $template_file->slug : self::PLUGIN_SLUG . '//' . $template_file->slug;
-		$template->theme   = $template_is_from_theme ? $theme_name : self::PLUGIN_SLUG;
-		$template->content = self::inject_theme_attribute_in_content( $template_content );
-		// Plugin was agreed as a valid source value despite existing inline docs at the time of creating: https://github.com/WordPress/gutenberg/issues/36597#issuecomment-976232909.
-		$template->source         = $template_file->source ? $template_file->source : 'plugin';
-		$template->slug           = $template_file->slug;
-		$template->type           = $template_type;
-		$template->title          = ! empty( $template_file->title ) ? $template_file->title : self::get_block_template_title( $template_file->slug );
-		$template->description    = ! empty( $template_file->description ) ? $template_file->description : self::get_block_template_description( $template_file->slug );
-		$template->status         = 'publish';
-		$template->has_theme_file = true;
-		$template->origin         = $template_file->source;
-		$template->is_custom      = false; // Templates loaded from the filesystem aren't custom, ones that have been edited and loaded from the DB are.
-		$template->post_types     = array(); // Don't appear in any Edit Post template selector dropdown.
-		$template->area           = 'uncategorized';
-		return $template;
-	}
-
-	/**
-	 * Build a new template object so that we can make Woo Blocks default templates available in the current theme should they not have any.
-	 *
-	 * @param string $template_file Block template file path.
-	 * @param string $template_type wp_template or wp_template_part.
-	 * @param string $template_slug Block template slug e.g. single-product.
-	 * @param bool   $template_is_from_theme If the block template file is being loaded from the current theme instead of Woo Blocks.
-	 *
-	 * @return object Block template object.
-	 */
-	public static function create_new_block_template_object( $template_file, $template_type, $template_slug, $template_is_from_theme = false ) {
-		$theme_name = wp_get_theme()->get( 'TextDomain' );
-
-		$new_template_item = array(
-			'slug'        => $template_slug,
-			'id'          => $template_is_from_theme ? $theme_name . '//' . $template_slug : self::PLUGIN_SLUG . '//' . $template_slug,
-			'path'        => $template_file,
-			'type'        => $template_type,
-			'theme'       => $template_is_from_theme ? $theme_name : self::PLUGIN_SLUG,
-			// Plugin was agreed as a valid source value despite existing inline docs at the time of creating: https://github.com/WordPress/gutenberg/issues/36597#issuecomment-976232909.
-			'source'      => $template_is_from_theme ? 'theme' : 'plugin',
-			'title'       => self::get_block_template_title( $template_slug ),
-			'description' => self::get_block_template_description( $template_slug ),
-			'post_types'  => array(), // Don't appear in any Edit Post template selector dropdown.
-		);
-
-		return (object) $new_template_item;
-	}
-
-	/**
-	 * Finds all nested template part file paths in a theme's directory.
-	 *
-	 * @param string $base_directory The theme's file path.
-	 * @return array $path_list A list of paths to all template part files.
-	 */
-	public static function get_template_paths( $base_directory ) {
-		$path_list = array();
-		if ( file_exists( $base_directory ) ) {
-			$nested_files      = new \RecursiveIteratorIterator( new \RecursiveDirectoryIterator( $base_directory ) );
-			$nested_html_files = new \RegexIterator( $nested_files, '/^.+\.html$/i', \RecursiveRegexIterator::GET_MATCH );
-			foreach ( $nested_html_files as $path => $file ) {
-				$path_list[] = $path;
-			}
-		}
-		return $path_list;
-	}
-
-	/**
-	 * Returns template titles.
-	 *
-	 * @param string $template_slug The templates slug (e.g. single-product).
-	 * @return string Human friendly title.
-	 */
-	public static function get_block_template_title( $template_slug ) {
-		$plugin_template_types = self::get_plugin_block_template_types();
-		if ( isset( $plugin_template_types[ $template_slug ] ) ) {
-			return $plugin_template_types[ $template_slug ]['title'];
-		} else {
-			// Human friendly title converted from the slug.
-			return ucwords( preg_replace( '/[\-_]/', ' ', $template_slug ) );
-		}
-	}
-
-	/**
-	 * Returns template descriptions.
-	 *
-	 * @param string $template_slug The templates slug (e.g. single-product).
-	 * @return string Template description.
-	 */
-	public static function get_block_template_description( $template_slug ) {
-		$plugin_template_types = self::get_plugin_block_template_types();
-		if ( isset( $plugin_template_types[ $template_slug ] ) ) {
-			return $plugin_template_types[ $template_slug ]['description'];
-		}
-		return '';
-	}
-
-	/**
-	 * Returns a filtered list of plugin template types, containing their
-	 * localized titles and descriptions.
-	 *
-	 * @return array The plugin template types.
-	 */
-	public static function get_plugin_block_template_types() {
-		$plugin_template_types = array(
-			'single-product'                   => array(
-				'title'       => _x( 'Single Product', 'Template name', 'woocommerce' ),
-				'description' => __( 'Template used to display the single product.', 'woocommerce' ),
-			),
-			'archive-product'                  => array(
-				'title'       => _x( 'Product Catalog', 'Template name', 'woocommerce' ),
-				'description' => __( 'Template used to display products.', 'woocommerce' ),
-			),
-			'taxonomy-product_cat'             => array(
-				'title'       => _x( 'Products by Category', 'Template name', 'woocommerce' ),
-				'description' => __( 'Template used to display products by category.', 'woocommerce' ),
-			),
-			'taxonomy-product_tag'             => array(
-				'title'       => _x( 'Products by Tag', 'Template name', 'woocommerce' ),
-				'description' => __( 'Template used to display products by tag.', 'woocommerce' ),
-			),
-			ProductSearchResultsTemplate::SLUG => array(
-				'title'       => _x( 'Product Search Results', 'Template name', 'woocommerce' ),
-				'description' => __( 'Template used to display search results for products.', 'woocommerce' ),
-			),
-			MiniCartTemplate::SLUG             => array(
-				'title'       => _x( 'Mini Cart', 'Template name', 'woocommerce' ),
-				'description' => __( 'Template used to display the Mini Cart drawer.', 'woocommerce' ),
-			),
-		);
-
-		return $plugin_template_types;
-	}
-
-	/**
-	 * Converts template paths into a slug
-	 *
-	 * @param string $path The template's path.
-	 * @return string slug
-	 */
-	public static function generate_template_slug_from_path( $path ) {
-		$template_extension = '.html';
-
-		return basename( $path, $template_extension );
-	}
-
-	/**
-	 * Gets the first matching template part within themes directories
-	 *
-	 * Since [Gutenberg 12.1.0](https://github.com/WordPress/gutenberg/releases/tag/v12.1.0), the conventions for
-	 * block templates and parts directory has changed from `block-templates` and `block-templates-parts`
-	 * to `templates` and `parts` respectively.
-	 *
-	 * This function traverses all possible combinations of directory paths where a template or part
-	 * could be located and returns the first one which is readable, prioritizing the new convention
-	 * over the deprecated one, but maintaining that one for backwards compatibility.
-	 *
-	 * @param string $template_slug  The slug of the template (i.e. without the file extension).
-	 * @param string $template_type  Either `wp_template` or `wp_template_part`.
-	 *
-	 * @return string|null  The matched path or `null` if no match was found.
-	 */
-	public static function get_theme_template_path( $template_slug, $template_type = 'wp_template' ) {
-		$template_filename      = $template_slug . '.html';
-		$possible_templates_dir = 'wp_template' === $template_type ? array(
-			self::DIRECTORY_NAMES['TEMPLATES'],
-			self::DIRECTORY_NAMES['DEPRECATED_TEMPLATES'],
-		) : array(
-			self::DIRECTORY_NAMES['TEMPLATE_PARTS'],
-			self::DIRECTORY_NAMES['DEPRECATED_TEMPLATE_PARTS'],
-		);
-
-		// Combine the possible root directory names with either the template directory
-		// or the stylesheet directory for child themes.
-		$possible_paths = array_reduce(
-			$possible_templates_dir,
-			function( $carry, $item ) use ( $template_filename ) {
-				$filepath = DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . $template_filename;
-
-				$carry[] = get_stylesheet_directory() . $filepath;
-				$carry[] = get_template_directory() . $filepath;
-
-				return $carry;
-			},
-			array()
-		);
-
-		// Return the first matching.
-		foreach ( $possible_paths as $path ) {
-			if ( is_readable( $path ) ) {
-				return $path;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Check if the theme has a template. So we know if to load our own in or not.
-	 *
-	 * @param string $template_name name of the template file without .html extension e.g. 'single-product'.
-	 * @return boolean
-	 */
-	public static function theme_has_template( $template_name ) {
-		return ! ! self::get_theme_template_path( $template_name, 'wp_template' );
-	}
-
-	/**
-	 * Check if the theme has a template. So we know if to load our own in or not.
-	 *
-	 * @param string $template_name name of the template file without .html extension e.g. 'single-product'.
-	 * @return boolean
-	 */
-	public static function theme_has_template_part( $template_name ) {
-		return ! ! self::get_theme_template_path( $template_name, 'wp_template_part' );
-	}
-
-	/**
-	 * Checks to see if they are using a compatible version of WP, or if not they have a compatible version of the Gutenberg plugin installed.
-	 *
-	 * @return boolean
-	 */
-	public static function supports_block_templates() {
-		if (
-			! wc_current_theme_is_fse_theme() &&
-			( ! function_exists( 'gutenberg_supports_block_templates' ) || ! gutenberg_supports_block_templates() )
-		) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Retrieves a single unified template object using its id.
-	 *
-	 * @param string $id            Template unique identifier (example: theme_slug//template_slug).
-	 * @param string $template_type Optional. Template type: `'wp_template'` or '`wp_template_part'`.
-	 *                             Default `'wp_template'`.
-	 *
-	 * @return WP_Block_Template|null Template.
-	 */
-	public static function get_block_template( $id, $template_type ) {
-		if ( function_exists( 'get_block_template' ) ) {
-			return get_block_template( $id, $template_type );
-		}
-
-		if ( function_exists( 'gutenberg_get_block_template' ) ) {
-			return gutenberg_get_block_template( $id, $template_type );
-		}
-
-		return null;
-
-	}
-
-	/**
-	 * Checks if we can fallback to the `archive-product` template for a given slug
-	 *
-	 * `taxonomy-product_cat` and `taxonomy-product_tag` templates can generally use the
-	 * `archive-product` as a fallback if there are no specific overrides.
-	 *
-	 * @param string $template_slug Slug to check for fallbacks.
-	 * @return boolean
-	 */
-	public static function template_is_eligible_for_product_archive_fallback( $template_slug ) {
-		$eligible_for_fallbacks = array( 'taxonomy-product_cat', 'taxonomy-product_tag' );
-
-		return in_array( $template_slug, $eligible_for_fallbacks, true )
-			&& ! self::theme_has_template( $template_slug )
-			&& self::theme_has_template( 'archive-product' );
-	}
-
-	/**
-	 * Sets the `has_theme_file` to `true` for templates with fallbacks
-	 *
-	 * There are cases (such as tags and categories) in which fallback templates
-	 * can be used; so, while *technically* the theme doesn't have a specific file
-	 * for them, it is important that we tell Gutenberg that we do, in fact,
-	 * have a theme file (i.e. the fallback one).
-	 *
-	 * **Note:** this function changes the array that has been passed.
-	 *
-	 * It returns `true` if anything was changed, `false` otherwise.
-	 *
-	 * @param array  $query_result Array of template objects.
-	 * @param object $template A specific template object which could have a fallback.
-	 *
-	 * @return boolean
-	 */
-	public static function set_has_theme_file_if_fallback_is_available( $query_result, $template ) {
-		foreach ( $query_result as &$query_result_template ) {
-			if (
-				$query_result_template->slug === $template->slug
-				&& $query_result_template->theme === $template->theme
-			) {
-				if ( self::template_is_eligible_for_product_archive_fallback( $template->slug ) ) {
-					$query_result_template->has_theme_file = true;
-				}
-
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Filter block templates by feature flag.
-	 *
-	 * @param WP_Block_Template[] $block_templates An array of block template objects.
-	 *
-	 * @return WP_Block_Template[] An array of block template objects.
-	 */
-	public static function filter_block_templates_by_feature_flag( $block_templates ) {
-		$feature_gating = new FeatureGating();
-		$flag           = $feature_gating->get_flag();
-
-		/**
-		 * An array of block templates with slug as key and flag as value.
-		 *
-		 * @var array
-		*/
-		$block_templates_with_feature_gate = array();
-
-		return array_filter(
-			$block_templates,
-			function( $block_template ) use ( $flag, $block_templates_with_feature_gate ) {
-				if ( isset( $block_templates_with_feature_gate[ $block_template->slug ] ) ) {
-					return $block_templates_with_feature_gate[ $block_template->slug ] <= $flag;
-				}
-				return true;
-			}
-		);
-	}
-
-	/**
-	 * Removes templates that were added to a theme's block-templates directory, but already had a customised version saved in the database.
-	 *
-	 * @param \WP_Block_Template[]|\stdClass[] $templates List of templates to run the filter on.
-	 *
-	 * @return array List of templates with duplicates removed. The customised alternative is preferred over the theme default.
-	 */
-	public static function remove_theme_templates_with_custom_alternative( $templates ) {
-
-		// Get the slugs of all templates that have been customised and saved in the database.
-		$customised_template_slugs = array_map(
-			function( $template ) {
-				return $template->slug;
-			},
-			array_values(
-				array_filter(
-					$templates,
-					function( $template ) {
-						// This template has been customised and saved as a post.
-						return 'custom' === $template->source;
-					}
-				)
-			)
-		);
-
-		// Remove theme (i.e. filesystem) templates that have the same slug as a customised one. We don't need to check
-		// for `woocommerce` in $template->source here because woocommerce templates won't have been added to $templates
-		// if a saved version was found in the db. This only affects saved templates that were saved BEFORE a theme
-		// template with the same slug was added.
-		return array_values(
-			array_filter(
-				$templates,
-				function( $template ) use ( $customised_template_slugs ) {
-					// This template has been customised and saved as a post, so return it.
-					return ! ( 'theme' === $template->source && in_array( $template->slug, $customised_template_slugs, true ) );
-				}
-			)
-		);
-	}
+    /**
+     * Directory names for block templates
+     *
+     * Directory names conventions for block templates have changed with Gutenberg 12.1.0,
+     * however, for backwards-compatibility, we also keep the older conventions, prefixed
+     * with `DEPRECATED_`.
+     *
+     * @var array {
+     *     @var string DEPRECATED_TEMPLATES  Old directory name of the block templates directory.
+     *     @var string DEPRECATED_TEMPLATE_PARTS  Old directory name of the block template parts directory.
+     *     @var string TEMPLATES_DIR_NAME  Directory name of the block templates directory.
+     *     @var string TEMPLATE_PARTS_DIR_NAME  Directory name of the block template parts directory.
+     * }
+     */
+    const DIRECTORY_NAMES = array(
+        'DEPRECATED_TEMPLATES'      => 'block-templates',
+        'DEPRECATED_TEMPLATE_PARTS' => 'block-template-parts',
+        'TEMPLATES'                 => 'templates',
+        'TEMPLATE_PARTS'            => 'parts',
+    );
+
+    /**
+     * WooCommerce plugin slug
+     *
+     * This is used to save templates to the DB which are stored against this value in the wp_terms table.
+     *
+     * @var string
+     */
+    const PLUGIN_SLUG = 'woocommerce/woocommerce';
+
+    /**
+     * Deprecated WooCommerce plugin slug
+     *
+     * For supporting users who have customized templates under the incorrect plugin slug during the first release.
+     * More context found here: https://github.com/woocommerce/woocommerce-gutenberg-products-block/issues/5423.
+     *
+     * @var string
+     */
+    const DEPRECATED_PLUGIN_SLUG = 'woocommerce';
+
+    /**
+     * Returns an array containing the references of
+     * the passed blocks and their inner blocks.
+     *
+     * @param array $blocks array of blocks.
+     *
+     * @return array block references to the passed blocks and their inner blocks.
+     */
+    public static function flatten_blocks( &$blocks ) {
+        $all_blocks = array();
+        $queue      = array();
+        foreach ( $blocks as &$block ) {
+            $queue[] = &$block;
+        }
+        $queue_count = count( $queue );
+
+        while ( $queue_count > 0 ) {
+            $block = &$queue[0];
+            array_shift( $queue );
+            $all_blocks[] = &$block;
+
+            if ( ! empty( $block['innerBlocks'] ) ) {
+                foreach ( $block['innerBlocks'] as &$inner_block ) {
+                    $queue[] = &$inner_block;
+                }
+            }
+
+            $queue_count = count( $queue );
+        }
+
+        return $all_blocks;
+    }
+
+    /**
+     * Parses wp_template content and injects the current theme's
+     * stylesheet as a theme attribute into each wp_template_part
+     *
+     * @param string $template_content serialized wp_template content.
+     *
+     * @return string Updated wp_template content.
+     */
+    public static function inject_theme_attribute_in_content( $template_content ) {
+        $has_updated_content = false;
+        $new_content         = '';
+        $template_blocks     = parse_blocks( $template_content );
+
+        $blocks = self::flatten_blocks( $template_blocks );
+        foreach ( $blocks as &$block ) {
+            if (
+                'core/template-part' === $block['blockName'] &&
+                ! isset( $block['attrs']['theme'] )
+            ) {
+                $block['attrs']['theme'] = wp_get_theme()->get_stylesheet();
+                $has_updated_content     = true;
+            }
+        }
+
+        if ( $has_updated_content ) {
+            foreach ( $template_blocks as &$block ) {
+                $new_content .= serialize_block( $block );
+            }
+
+            return $new_content;
+        }
+
+        return $template_content;
+    }
+
+    /**
+     * Build a unified template object based a post Object.
+     * Important: This method is an almost identical duplicate from wp-includes/block-template-utils.php as it was not intended for public use. It has been modified to build templates from plugins rather than themes.
+     *
+     * @param \WP_Post $post Template post.
+     *
+     * @return \WP_Block_Template|\WP_Error Template.
+     */
+    public static function build_template_result_from_post( $post ) {
+        $terms = get_the_terms( $post, 'wp_theme' );
+
+        if ( is_wp_error( $terms ) ) {
+            return $terms;
+        }
+
+        if ( ! $terms ) {
+            return new \WP_Error( 'template_missing_theme', __( 'No theme is defined for this template.', 'woocommerce' ) );
+        }
+
+        $theme          = $terms[0]->name;
+        $has_theme_file = true;
+
+        $template                 = new \WP_Block_Template();
+        $template->wp_id          = $post->ID;
+        $template->id             = $theme . '//' . $post->post_name;
+        $template->theme          = $theme;
+        $template->content        = $post->post_content;
+        $template->slug           = $post->post_name;
+        $template->source         = 'custom';
+        $template->type           = $post->post_type;
+        $template->description    = $post->post_excerpt;
+        $template->title          = $post->post_title;
+        $template->status         = $post->post_status;
+        $template->has_theme_file = $has_theme_file;
+        $template->is_custom      = false;
+        $template->post_types     = array(); // Don't appear in any Edit Post template selector dropdown.
+
+        if ( 'wp_template_part' === $post->post_type ) {
+            $type_terms = get_the_terms( $post, 'wp_template_part_area' );
+            if ( ! is_wp_error( $type_terms ) && false !== $type_terms ) {
+                $template->area = $type_terms[0]->name;
+            }
+        }
+
+        // We are checking 'woocommerce' to maintain classic templates which are saved to the DB,
+        // prior to updating to use the correct slug.
+        // More information found here: https://github.com/woocommerce/woocommerce-gutenberg-products-block/issues/5423.
+        if ( self::PLUGIN_SLUG === $theme || self::DEPRECATED_PLUGIN_SLUG === strtolower( $theme ) ) {
+            $template->origin = 'plugin';
+        }
+
+        return $template;
+    }
+
+    /**
+     * Build a unified template object based on a theme file.
+     * Important: This method is an almost identical duplicate from wp-includes/block-template-utils.php as it was not intended for public use. It has been modified to build templates from plugins rather than themes.
+     *
+     * @param array|object $template_file Theme file.
+     * @param string       $template_type wp_template or wp_template_part.
+     *
+     * @return \WP_Block_Template Template.
+     */
+    public static function build_template_result_from_file( $template_file, $template_type ) {
+        $template_file = (object) $template_file;
+
+        // If the theme has an archive-products.html template but does not have product taxonomy templates
+        // then we will load in the archive-product.html template from the theme to use for product taxonomies on the frontend.
+        $template_is_from_theme = 'theme' === $template_file->source;
+        $theme_name             = wp_get_theme()->get( 'TextDomain' );
+
+        // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
+        $template_content  = file_get_contents( $template_file->path );
+        $template          = new \WP_Block_Template();
+        $template->id      = $template_is_from_theme ? $theme_name . '//' . $template_file->slug : self::PLUGIN_SLUG . '//' . $template_file->slug;
+        $template->theme   = $template_is_from_theme ? $theme_name : self::PLUGIN_SLUG;
+        $template->content = self::inject_theme_attribute_in_content( $template_content );
+        // Plugin was agreed as a valid source value despite existing inline docs at the time of creating: https://github.com/WordPress/gutenberg/issues/36597#issuecomment-976232909.
+        $template->source         = $template_file->source ? $template_file->source : 'plugin';
+        $template->slug           = $template_file->slug;
+        $template->type           = $template_type;
+        $template->title          = ! empty( $template_file->title ) ? $template_file->title : self::get_block_template_title( $template_file->slug );
+        $template->description    = ! empty( $template_file->description ) ? $template_file->description : self::get_block_template_description( $template_file->slug );
+        $template->status         = 'publish';
+        $template->has_theme_file = true;
+        $template->origin         = $template_file->source;
+        $template->is_custom      = false; // Templates loaded from the filesystem aren't custom, ones that have been edited and loaded from the DB are.
+        $template->post_types     = array(); // Don't appear in any Edit Post template selector dropdown.
+        $template->area           = 'uncategorized';
+        return $template;
+    }
+
+    /**
+     * Build a new template object so that we can make Woo Blocks default templates available in the current theme should they not have any.
+     *
+     * @param string $template_file Block template file path.
+     * @param string $template_type wp_template or wp_template_part.
+     * @param string $template_slug Block template slug e.g. single-product.
+     * @param bool   $template_is_from_theme If the block template file is being loaded from the current theme instead of Woo Blocks.
+     *
+     * @return object Block template object.
+     */
+    public static function create_new_block_template_object( $template_file, $template_type, $template_slug, $template_is_from_theme = false ) {
+        $theme_name = wp_get_theme()->get( 'TextDomain' );
+
+        $new_template_item = array(
+            'slug'        => $template_slug,
+            'id'          => $template_is_from_theme ? $theme_name . '//' . $template_slug : self::PLUGIN_SLUG . '//' . $template_slug,
+            'path'        => $template_file,
+            'type'        => $template_type,
+            'theme'       => $template_is_from_theme ? $theme_name : self::PLUGIN_SLUG,
+            // Plugin was agreed as a valid source value despite existing inline docs at the time of creating: https://github.com/WordPress/gutenberg/issues/36597#issuecomment-976232909.
+            'source'      => $template_is_from_theme ? 'theme' : 'plugin',
+            'title'       => self::get_block_template_title( $template_slug ),
+            'description' => self::get_block_template_description( $template_slug ),
+            'post_types'  => array(), // Don't appear in any Edit Post template selector dropdown.
+        );
+
+        return (object) $new_template_item;
+    }
+
+    /**
+     * Finds all nested template part file paths in a theme's directory.
+     *
+     * @param string $base_directory The theme's file path.
+     * @return array $path_list A list of paths to all template part files.
+     */
+    public static function get_template_paths( $base_directory ) {
+        $path_list = array();
+        if ( file_exists( $base_directory ) ) {
+            $nested_files      = new \RecursiveIteratorIterator( new \RecursiveDirectoryIterator( $base_directory ) );
+            $nested_html_files = new \RegexIterator( $nested_files, '/^.+\.html$/i', \RecursiveRegexIterator::GET_MATCH );
+            foreach ( $nested_html_files as $path => $file ) {
+                $path_list[] = $path;
+            }
+        }
+        return $path_list;
+    }
+
+    /**
+     * Returns template titles.
+     *
+     * @param string $template_slug The templates slug (e.g. single-product).
+     * @return string Human friendly title.
+     */
+    public static function get_block_template_title( $template_slug ) {
+        $plugin_template_types = self::get_plugin_block_template_types();
+        if ( isset( $plugin_template_types[ $template_slug ] ) ) {
+            return $plugin_template_types[ $template_slug ]['title'];
+        } else {
+            // Human friendly title converted from the slug.
+            return ucwords( preg_replace( '/[\-_]/', ' ', $template_slug ) );
+        }
+    }
+
+    /**
+     * Returns template descriptions.
+     *
+     * @param string $template_slug The templates slug (e.g. single-product).
+     * @return string Template description.
+     */
+    public static function get_block_template_description( $template_slug ) {
+        $plugin_template_types = self::get_plugin_block_template_types();
+        if ( isset( $plugin_template_types[ $template_slug ] ) ) {
+            return $plugin_template_types[ $template_slug ]['description'];
+        }
+        return '';
+    }
+
+    /**
+     * Returns a filtered list of plugin template types, containing their
+     * localized titles and descriptions.
+     *
+     * @return array The plugin template types.
+     */
+    public static function get_plugin_block_template_types() {
+        $plugin_template_types = array(
+            'single-product'                   => array(
+                'title'       => _x( 'Single Product', 'Template name', 'woocommerce' ),
+                'description' => __( 'Template used to display the single product.', 'woocommerce' ),
+            ),
+            'archive-product'                  => array(
+                'title'       => _x( 'Product Catalog', 'Template name', 'woocommerce' ),
+                'description' => __( 'Template used to display products.', 'woocommerce' ),
+            ),
+            'taxonomy-product_cat'             => array(
+                'title'       => _x( 'Products by Category', 'Template name', 'woocommerce' ),
+                'description' => __( 'Template used to display products by category.', 'woocommerce' ),
+            ),
+            'taxonomy-product_tag'             => array(
+                'title'       => _x( 'Products by Tag', 'Template name', 'woocommerce' ),
+                'description' => __( 'Template used to display products by tag.', 'woocommerce' ),
+            ),
+            ProductSearchResultsTemplate::SLUG => array(
+                'title'       => _x( 'Product Search Results', 'Template name', 'woocommerce' ),
+                'description' => __( 'Template used to display search results for products.', 'woocommerce' ),
+            ),
+            MiniCartTemplate::SLUG             => array(
+                'title'       => _x( 'Mini Cart', 'Template name', 'woocommerce' ),
+                'description' => __( 'Template used to display the Mini Cart drawer.', 'woocommerce' ),
+            ),
+        );
+
+        return $plugin_template_types;
+    }
+
+    /**
+     * Converts template paths into a slug
+     *
+     * @param string $path The template's path.
+     * @return string slug
+     */
+    public static function generate_template_slug_from_path( $path ) {
+        $template_extension = '.html';
+
+        return basename( $path, $template_extension );
+    }
+
+    /**
+     * Gets the first matching template part within themes directories
+     *
+     * Since [Gutenberg 12.1.0](https://github.com/WordPress/gutenberg/releases/tag/v12.1.0), the conventions for
+     * block templates and parts directory has changed from `block-templates` and `block-templates-parts`
+     * to `templates` and `parts` respectively.
+     *
+     * This function traverses all possible combinations of directory paths where a template or part
+     * could be located and returns the first one which is readable, prioritizing the new convention
+     * over the deprecated one, but maintaining that one for backwards compatibility.
+     *
+     * @param string $template_slug  The slug of the template (i.e. without the file extension).
+     * @param string $template_type  Either `wp_template` or `wp_template_part`.
+     *
+     * @return string|null  The matched path or `null` if no match was found.
+     */
+    public static function get_theme_template_path( $template_slug, $template_type = 'wp_template' ) {
+        $template_filename      = $template_slug . '.html';
+        $possible_templates_dir = 'wp_template' === $template_type ? array(
+            self::DIRECTORY_NAMES['TEMPLATES'],
+            self::DIRECTORY_NAMES['DEPRECATED_TEMPLATES'],
+        ) : array(
+            self::DIRECTORY_NAMES['TEMPLATE_PARTS'],
+            self::DIRECTORY_NAMES['DEPRECATED_TEMPLATE_PARTS'],
+        );
+
+        // Combine the possible root directory names with either the template directory
+        // or the stylesheet directory for child themes.
+        $possible_paths = array_reduce(
+            $possible_templates_dir,
+            function( $carry, $item ) use ( $template_filename ) {
+                $filepath = DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . $template_filename;
+
+                $carry[] = get_stylesheet_directory() . $filepath;
+                $carry[] = get_template_directory() . $filepath;
+
+                return $carry;
+            },
+            array()
+        );
+
+        // Return the first matching.
+        foreach ( $possible_paths as $path ) {
+            if ( is_readable( $path ) ) {
+                return $path;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Check if the theme has a template. So we know if to load our own in or not.
+     *
+     * @param string $template_name name of the template file without .html extension e.g. 'single-product'.
+     * @return boolean
+     */
+    public static function theme_has_template( $template_name ) {
+        return ! ! self::get_theme_template_path( $template_name, 'wp_template' );
+    }
+
+    /**
+     * Check if the theme has a template. So we know if to load our own in or not.
+     *
+     * @param string $template_name name of the template file without .html extension e.g. 'single-product'.
+     * @return boolean
+     */
+    public static function theme_has_template_part( $template_name ) {
+        return ! ! self::get_theme_template_path( $template_name, 'wp_template_part' );
+    }
+
+    /**
+     * Checks to see if they are using a compatible version of WP, or if not they have a compatible version of the Gutenberg plugin installed.
+     *
+     * @return boolean
+     */
+    public static function supports_block_templates() {
+        if (
+            ! wc_current_theme_is_fse_theme() &&
+            ( ! function_exists( 'gutenberg_supports_block_templates' ) || ! gutenberg_supports_block_templates() )
+        ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Retrieves a single unified template object using its id.
+     *
+     * @param string $id            Template unique identifier (example: theme_slug//template_slug).
+     * @param string $template_type Optional. Template type: `'wp_template'` or '`wp_template_part'`.
+     *                             Default `'wp_template'`.
+     *
+     * @return WP_Block_Template|null Template.
+     */
+    public static function get_block_template( $id, $template_type ) {
+        if ( function_exists( 'get_block_template' ) ) {
+            return get_block_template( $id, $template_type );
+        }
+
+        if ( function_exists( 'gutenberg_get_block_template' ) ) {
+            return gutenberg_get_block_template( $id, $template_type );
+        }
+
+        return null;
+
+    }
+
+    /**
+     * Checks if we can fallback to the `archive-product` template for a given slug
+     *
+     * `taxonomy-product_cat` and `taxonomy-product_tag` templates can generally use the
+     * `archive-product` as a fallback if there are no specific overrides.
+     *
+     * @param string $template_slug Slug to check for fallbacks.
+     * @return boolean
+     */
+    public static function template_is_eligible_for_product_archive_fallback( $template_slug ) {
+        $eligible_for_fallbacks = array( 'taxonomy-product_cat', 'taxonomy-product_tag' );
+
+        return in_array( $template_slug, $eligible_for_fallbacks, true )
+            && ! self::theme_has_template( $template_slug )
+            && self::theme_has_template( 'archive-product' );
+    }
+
+    /**
+     * Sets the `has_theme_file` to `true` for templates with fallbacks
+     *
+     * There are cases (such as tags and categories) in which fallback templates
+     * can be used; so, while *technically* the theme doesn't have a specific file
+     * for them, it is important that we tell Gutenberg that we do, in fact,
+     * have a theme file (i.e. the fallback one).
+     *
+     * **Note:** this function changes the array that has been passed.
+     *
+     * It returns `true` if anything was changed, `false` otherwise.
+     *
+     * @param array  $query_result Array of template objects.
+     * @param object $template A specific template object which could have a fallback.
+     *
+     * @return boolean
+     */
+    public static function set_has_theme_file_if_fallback_is_available( $query_result, $template ) {
+        foreach ( $query_result as &$query_result_template ) {
+            if (
+                $query_result_template->slug === $template->slug
+                && $query_result_template->theme === $template->theme
+            ) {
+                if ( self::template_is_eligible_for_product_archive_fallback( $template->slug ) ) {
+                    $query_result_template->has_theme_file = true;
+                }
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Filter block templates by feature flag.
+     *
+     * @param WP_Block_Template[] $block_templates An array of block template objects.
+     *
+     * @return WP_Block_Template[] An array of block template objects.
+     */
+    public static function filter_block_templates_by_feature_flag( $block_templates ) {
+        $feature_gating = new FeatureGating();
+        $flag           = $feature_gating->get_flag();
+
+        /**
+         * An array of block templates with slug as key and flag as value.
+         *
+         * @var array
+         */
+        $block_templates_with_feature_gate = array();
+
+        return array_filter(
+            $block_templates,
+            function( $block_template ) use ( $flag, $block_templates_with_feature_gate ) {
+                if ( isset( $block_templates_with_feature_gate[ $block_template->slug ] ) ) {
+                    return $block_templates_with_feature_gate[ $block_template->slug ] <= $flag;
+                }
+                return true;
+            }
+        );
+    }
+
+    /**
+     * Removes templates that were added to a theme's block-templates directory, but already had a customised version saved in the database.
+     *
+     * @param \WP_Block_Template[]|\stdClass[] $templates List of templates to run the filter on.
+     *
+     * @return array List of templates with duplicates removed. The customised alternative is preferred over the theme default.
+     */
+    public static function remove_theme_templates_with_custom_alternative( $templates ) {
+
+        // Get the slugs of all templates that have been customised and saved in the database.
+        $customised_template_slugs = array_map(
+            function( $template ) {
+                return $template->slug;
+            },
+            array_values(
+                array_filter(
+                    $templates,
+                    function( $template ) {
+                        // This template has been customised and saved as a post.
+                        return 'custom' === $template->source;
+                    }
+                )
+            )
+        );
+
+        // Remove theme (i.e. filesystem) templates that have the same slug as a customised one. We don't need to check
+        // for `woocommerce` in $template->source here because woocommerce templates won't have been added to $templates
+        // if a saved version was found in the db. This only affects saved templates that were saved BEFORE a theme
+        // template with the same slug was added.
+        return array_values(
+            array_filter(
+                $templates,
+                function( $template ) use ( $customised_template_slugs ) {
+                    // This template has been customised and saved as a post, so return it.
+                    return ! ( 'theme' === $template->source && in_array( $template->slug, $customised_template_slugs, true ) );
+                }
+            )
+        );
+    }
 }

Spacing +93 added lines, -93 removed lines

@@ -58,26 +58,26 @@ 
 	 *
 	 * @return array block references to the passed blocks and their inner blocks.
 	 */
-	public static function flatten_blocks( &$blocks ) {
+	public static function flatten_blocks(&$blocks) {
 		$all_blocks = array();
 		$queue      = array();
-		foreach ( $blocks as &$block ) {
+		foreach ($blocks as &$block) {
 			$queue[] = &$block;
 		}
-		$queue_count = count( $queue );
+		$queue_count = count($queue);
 
-		while ( $queue_count > 0 ) {
+		while ($queue_count > 0) {
 			$block = &$queue[0];
-			array_shift( $queue );
+			array_shift($queue);
 			$all_blocks[] = &$block;
 
-			if ( ! empty( $block['innerBlocks'] ) ) {
-				foreach ( $block['innerBlocks'] as &$inner_block ) {
+			if (!empty($block['innerBlocks'])) {
+				foreach ($block['innerBlocks'] as &$inner_block) {
 					$queue[] = &$inner_block;
 				}
 			}
 
-			$queue_count = count( $queue );
+			$queue_count = count($queue);
 		}
 
 		return $all_blocks;
@@ -91,25 +91,25 @@ 
 	 *
 	 * @return string Updated wp_template content.
 	 */
-	public static function inject_theme_attribute_in_content( $template_content ) {
+	public static function inject_theme_attribute_in_content($template_content) {
 		$has_updated_content = false;
 		$new_content         = '';
-		$template_blocks     = parse_blocks( $template_content );
+		$template_blocks     = parse_blocks($template_content);
 
-		$blocks = self::flatten_blocks( $template_blocks );
-		foreach ( $blocks as &$block ) {
+		$blocks = self::flatten_blocks($template_blocks);
+		foreach ($blocks as &$block) {
 			if (
 				'core/template-part' === $block['blockName'] &&
-				! isset( $block['attrs']['theme'] )
+				!isset($block['attrs']['theme'])
 			) {
 				$block['attrs']['theme'] = wp_get_theme()->get_stylesheet();
 				$has_updated_content     = true;
 			}
 		}
 
-		if ( $has_updated_content ) {
-			foreach ( $template_blocks as &$block ) {
-				$new_content .= serialize_block( $block );
+		if ($has_updated_content) {
+			foreach ($template_blocks as &$block) {
+				$new_content .= serialize_block($block);
 			}
 
 			return $new_content;
@@ -126,15 +126,15 @@ 
 	 *
 	 * @return \WP_Block_Template|\WP_Error Template.
 	 */
-	public static function build_template_result_from_post( $post ) {
-		$terms = get_the_terms( $post, 'wp_theme' );
+	public static function build_template_result_from_post($post) {
+		$terms = get_the_terms($post, 'wp_theme');
 
-		if ( is_wp_error( $terms ) ) {
+		if (is_wp_error($terms)) {
 			return $terms;
 		}
 
-		if ( ! $terms ) {
-			return new \WP_Error( 'template_missing_theme', __( 'No theme is defined for this template.', 'woocommerce' ) );
+		if (!$terms) {
+			return new \WP_Error('template_missing_theme', __('No theme is defined for this template.', 'woocommerce'));
 		}
 
 		$theme          = $terms[0]->name;
@@ -155,9 +155,9 @@ 
 		$template->is_custom      = false;
 		$template->post_types     = array(); // Don't appear in any Edit Post template selector dropdown.
 
-		if ( 'wp_template_part' === $post->post_type ) {
-			$type_terms = get_the_terms( $post, 'wp_template_part_area' );
-			if ( ! is_wp_error( $type_terms ) && false !== $type_terms ) {
+		if ('wp_template_part' === $post->post_type) {
+			$type_terms = get_the_terms($post, 'wp_template_part_area');
+			if (!is_wp_error($type_terms) && false !== $type_terms) {
 				$template->area = $type_terms[0]->name;
 			}
 		}
@@ -165,7 +165,7 @@ 
 		// We are checking 'woocommerce' to maintain classic templates which are saved to the DB,
 		// prior to updating to use the correct slug.
 		// More information found here: https://github.com/woocommerce/woocommerce-gutenberg-products-block/issues/5423.
-		if ( self::PLUGIN_SLUG === $theme || self::DEPRECATED_PLUGIN_SLUG === strtolower( $theme ) ) {
+		if (self::PLUGIN_SLUG === $theme || self::DEPRECATED_PLUGIN_SLUG === strtolower($theme)) {
 			$template->origin = 'plugin';
 		}
 
@@ -181,26 +181,26 @@ 
 	 *
 	 * @return \WP_Block_Template Template.
 	 */
-	public static function build_template_result_from_file( $template_file, $template_type ) {
+	public static function build_template_result_from_file($template_file, $template_type) {
 		$template_file = (object) $template_file;
 
 		// If the theme has an archive-products.html template but does not have product taxonomy templates
 		// then we will load in the archive-product.html template from the theme to use for product taxonomies on the frontend.
 		$template_is_from_theme = 'theme' === $template_file->source;
-		$theme_name             = wp_get_theme()->get( 'TextDomain' );
+		$theme_name             = wp_get_theme()->get('TextDomain');
 
 		// phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
-		$template_content  = file_get_contents( $template_file->path );
+		$template_content  = file_get_contents($template_file->path);
 		$template          = new \WP_Block_Template();
 		$template->id      = $template_is_from_theme ? $theme_name . '//' . $template_file->slug : self::PLUGIN_SLUG . '//' . $template_file->slug;
 		$template->theme   = $template_is_from_theme ? $theme_name : self::PLUGIN_SLUG;
-		$template->content = self::inject_theme_attribute_in_content( $template_content );
+		$template->content = self::inject_theme_attribute_in_content($template_content);
 		// Plugin was agreed as a valid source value despite existing inline docs at the time of creating: https://github.com/WordPress/gutenberg/issues/36597#issuecomment-976232909.
 		$template->source         = $template_file->source ? $template_file->source : 'plugin';
 		$template->slug           = $template_file->slug;
 		$template->type           = $template_type;
-		$template->title          = ! empty( $template_file->title ) ? $template_file->title : self::get_block_template_title( $template_file->slug );
-		$template->description    = ! empty( $template_file->description ) ? $template_file->description : self::get_block_template_description( $template_file->slug );
+		$template->title          = !empty($template_file->title) ? $template_file->title : self::get_block_template_title($template_file->slug);
+		$template->description    = !empty($template_file->description) ? $template_file->description : self::get_block_template_description($template_file->slug);
 		$template->status         = 'publish';
 		$template->has_theme_file = true;
 		$template->origin         = $template_file->source;
@@ -220,8 +220,8 @@ 
 	 *
 	 * @return object Block template object.
 	 */
-	public static function create_new_block_template_object( $template_file, $template_type, $template_slug, $template_is_from_theme = false ) {
-		$theme_name = wp_get_theme()->get( 'TextDomain' );
+	public static function create_new_block_template_object($template_file, $template_type, $template_slug, $template_is_from_theme = false) {
+		$theme_name = wp_get_theme()->get('TextDomain');
 
 		$new_template_item = array(
 			'slug'        => $template_slug,
@@ -231,8 +231,8 @@ 
 			'theme'       => $template_is_from_theme ? $theme_name : self::PLUGIN_SLUG,
 			// Plugin was agreed as a valid source value despite existing inline docs at the time of creating: https://github.com/WordPress/gutenberg/issues/36597#issuecomment-976232909.
 			'source'      => $template_is_from_theme ? 'theme' : 'plugin',
-			'title'       => self::get_block_template_title( $template_slug ),
-			'description' => self::get_block_template_description( $template_slug ),
+			'title'       => self::get_block_template_title($template_slug),
+			'description' => self::get_block_template_description($template_slug),
 			'post_types'  => array(), // Don't appear in any Edit Post template selector dropdown.
 		);
 
@@ -245,12 +245,12 @@ 
 	 * @param string $base_directory The theme's file path.
 	 * @return array $path_list A list of paths to all template part files.
 	 */
-	public static function get_template_paths( $base_directory ) {
+	public static function get_template_paths($base_directory) {
 		$path_list = array();
-		if ( file_exists( $base_directory ) ) {
-			$nested_files      = new \RecursiveIteratorIterator( new \RecursiveDirectoryIterator( $base_directory ) );
-			$nested_html_files = new \RegexIterator( $nested_files, '/^.+\.html$/i', \RecursiveRegexIterator::GET_MATCH );
-			foreach ( $nested_html_files as $path => $file ) {
+		if (file_exists($base_directory)) {
+			$nested_files      = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($base_directory));
+			$nested_html_files = new \RegexIterator($nested_files, '/^.+\.html$/i', \RecursiveRegexIterator::GET_MATCH);
+			foreach ($nested_html_files as $path => $file) {
 				$path_list[] = $path;
 			}
 		}
@@ -263,13 +263,13 @@ 
 	 * @param string $template_slug The templates slug (e.g. single-product).
 	 * @return string Human friendly title.
 	 */
-	public static function get_block_template_title( $template_slug ) {
+	public static function get_block_template_title($template_slug) {
 		$plugin_template_types = self::get_plugin_block_template_types();
-		if ( isset( $plugin_template_types[ $template_slug ] ) ) {
-			return $plugin_template_types[ $template_slug ]['title'];
+		if (isset($plugin_template_types[$template_slug])) {
+			return $plugin_template_types[$template_slug]['title'];
 		} else {
 			// Human friendly title converted from the slug.
-			return ucwords( preg_replace( '/[\-_]/', ' ', $template_slug ) );
+			return ucwords(preg_replace('/[\-_]/', ' ', $template_slug));
 		}
 	}
 
@@ -279,10 +279,10 @@ 
 	 * @param string $template_slug The templates slug (e.g. single-product).
 	 * @return string Template description.
 	 */
-	public static function get_block_template_description( $template_slug ) {
+	public static function get_block_template_description($template_slug) {
 		$plugin_template_types = self::get_plugin_block_template_types();
-		if ( isset( $plugin_template_types[ $template_slug ] ) ) {
-			return $plugin_template_types[ $template_slug ]['description'];
+		if (isset($plugin_template_types[$template_slug])) {
+			return $plugin_template_types[$template_slug]['description'];
 		}
 		return '';
 	}
@@ -296,28 +296,28 @@ 
 	public static function get_plugin_block_template_types() {
 		$plugin_template_types = array(
 			'single-product'                   => array(
-				'title'       => _x( 'Single Product', 'Template name', 'woocommerce' ),
-				'description' => __( 'Template used to display the single product.', 'woocommerce' ),
+				'title'       => _x('Single Product', 'Template name', 'woocommerce'),
+				'description' => __('Template used to display the single product.', 'woocommerce'),
 			),
 			'archive-product'                  => array(
-				'title'       => _x( 'Product Catalog', 'Template name', 'woocommerce' ),
-				'description' => __( 'Template used to display products.', 'woocommerce' ),
+				'title'       => _x('Product Catalog', 'Template name', 'woocommerce'),
+				'description' => __('Template used to display products.', 'woocommerce'),
 			),
 			'taxonomy-product_cat'             => array(
-				'title'       => _x( 'Products by Category', 'Template name', 'woocommerce' ),
-				'description' => __( 'Template used to display products by category.', 'woocommerce' ),
+				'title'       => _x('Products by Category', 'Template name', 'woocommerce'),
+				'description' => __('Template used to display products by category.', 'woocommerce'),
 			),
 			'taxonomy-product_tag'             => array(
-				'title'       => _x( 'Products by Tag', 'Template name', 'woocommerce' ),
-				'description' => __( 'Template used to display products by tag.', 'woocommerce' ),
+				'title'       => _x('Products by Tag', 'Template name', 'woocommerce'),
+				'description' => __('Template used to display products by tag.', 'woocommerce'),
 			),
 			ProductSearchResultsTemplate::SLUG => array(
-				'title'       => _x( 'Product Search Results', 'Template name', 'woocommerce' ),
-				'description' => __( 'Template used to display search results for products.', 'woocommerce' ),
+				'title'       => _x('Product Search Results', 'Template name', 'woocommerce'),
+				'description' => __('Template used to display search results for products.', 'woocommerce'),
 			),
 			MiniCartTemplate::SLUG             => array(
-				'title'       => _x( 'Mini Cart', 'Template name', 'woocommerce' ),
-				'description' => __( 'Template used to display the Mini Cart drawer.', 'woocommerce' ),
+				'title'       => _x('Mini Cart', 'Template name', 'woocommerce'),
+				'description' => __('Template used to display the Mini Cart drawer.', 'woocommerce'),
 			),
 		);
 
@@ -330,10 +330,10 @@ 
 	 * @param string $path The template's path.
 	 * @return string slug
 	 */
-	public static function generate_template_slug_from_path( $path ) {
+	public static function generate_template_slug_from_path($path) {
 		$template_extension = '.html';
 
-		return basename( $path, $template_extension );
+		return basename($path, $template_extension);
 	}
 
 	/**
@@ -352,7 +352,7 @@ 
 	 *
 	 * @return string|null  The matched path or `null` if no match was found.
 	 */
-	public static function get_theme_template_path( $template_slug, $template_type = 'wp_template' ) {
+	public static function get_theme_template_path($template_slug, $template_type = 'wp_template') {
 		$template_filename      = $template_slug . '.html';
 		$possible_templates_dir = 'wp_template' === $template_type ? array(
 			self::DIRECTORY_NAMES['TEMPLATES'],
@@ -366,7 +366,7 @@ 
 		// or the stylesheet directory for child themes.
 		$possible_paths = array_reduce(
 			$possible_templates_dir,
-			function( $carry, $item ) use ( $template_filename ) {
+			function($carry, $item) use ($template_filename) {
 				$filepath = DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . $template_filename;
 
 				$carry[] = get_stylesheet_directory() . $filepath;
@@ -378,8 +378,8 @@ 
 		);
 
 		// Return the first matching.
-		foreach ( $possible_paths as $path ) {
-			if ( is_readable( $path ) ) {
+		foreach ($possible_paths as $path) {
+			if (is_readable($path)) {
 				return $path;
 			}
 		}
@@ -393,8 +393,8 @@ 
 	 * @param string $template_name name of the template file without .html extension e.g. 'single-product'.
 	 * @return boolean
 	 */
-	public static function theme_has_template( $template_name ) {
-		return ! ! self::get_theme_template_path( $template_name, 'wp_template' );
+	public static function theme_has_template($template_name) {
+		return !!self::get_theme_template_path($template_name, 'wp_template');
 	}
 
 	/**
@@ -403,8 +403,8 @@ 
 	 * @param string $template_name name of the template file without .html extension e.g. 'single-product'.
 	 * @return boolean
 	 */
-	public static function theme_has_template_part( $template_name ) {
-		return ! ! self::get_theme_template_path( $template_name, 'wp_template_part' );
+	public static function theme_has_template_part($template_name) {
+		return !!self::get_theme_template_path($template_name, 'wp_template_part');
 	}
 
 	/**
@@ -414,8 +414,8 @@ 
 	 */
 	public static function supports_block_templates() {
 		if (
-			! wc_current_theme_is_fse_theme() &&
-			( ! function_exists( 'gutenberg_supports_block_templates' ) || ! gutenberg_supports_block_templates() )
+			!wc_current_theme_is_fse_theme() &&
+			(!function_exists('gutenberg_supports_block_templates') || !gutenberg_supports_block_templates())
 		) {
 			return false;
 		}
@@ -432,13 +432,13 @@ 
 	 *
 	 * @return WP_Block_Template|null Template.
 	 */
-	public static function get_block_template( $id, $template_type ) {
-		if ( function_exists( 'get_block_template' ) ) {
-			return get_block_template( $id, $template_type );
+	public static function get_block_template($id, $template_type) {
+		if (function_exists('get_block_template')) {
+			return get_block_template($id, $template_type);
 		}
 
-		if ( function_exists( 'gutenberg_get_block_template' ) ) {
-			return gutenberg_get_block_template( $id, $template_type );
+		if (function_exists('gutenberg_get_block_template')) {
+			return gutenberg_get_block_template($id, $template_type);
 		}
 
 		return null;
@@ -454,12 +454,12 @@ 
 	 * @param string $template_slug Slug to check for fallbacks.
 	 * @return boolean
 	 */
-	public static function template_is_eligible_for_product_archive_fallback( $template_slug ) {
-		$eligible_for_fallbacks = array( 'taxonomy-product_cat', 'taxonomy-product_tag' );
+	public static function template_is_eligible_for_product_archive_fallback($template_slug) {
+		$eligible_for_fallbacks = array('taxonomy-product_cat', 'taxonomy-product_tag');
 
-		return in_array( $template_slug, $eligible_for_fallbacks, true )
-			&& ! self::theme_has_template( $template_slug )
-			&& self::theme_has_template( 'archive-product' );
+		return in_array($template_slug, $eligible_for_fallbacks, true)
+			&& !self::theme_has_template($template_slug)
+			&& self::theme_has_template('archive-product');
 	}
 
 	/**
@@ -479,13 +479,13 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function set_has_theme_file_if_fallback_is_available( $query_result, $template ) {
-		foreach ( $query_result as &$query_result_template ) {
+	public static function set_has_theme_file_if_fallback_is_available($query_result, $template) {
+		foreach ($query_result as &$query_result_template) {
 			if (
 				$query_result_template->slug === $template->slug
 				&& $query_result_template->theme === $template->theme
 			) {
-				if ( self::template_is_eligible_for_product_archive_fallback( $template->slug ) ) {
+				if (self::template_is_eligible_for_product_archive_fallback($template->slug)) {
 					$query_result_template->has_theme_file = true;
 				}
 
@@ -503,7 +503,7 @@ 
 	 *
 	 * @return WP_Block_Template[] An array of block template objects.
 	 */
-	public static function filter_block_templates_by_feature_flag( $block_templates ) {
+	public static function filter_block_templates_by_feature_flag($block_templates) {
 		$feature_gating = new FeatureGating();
 		$flag           = $feature_gating->get_flag();
 
@@ -516,9 +516,9 @@ 
 
 		return array_filter(
 			$block_templates,
-			function( $block_template ) use ( $flag, $block_templates_with_feature_gate ) {
-				if ( isset( $block_templates_with_feature_gate[ $block_template->slug ] ) ) {
-					return $block_templates_with_feature_gate[ $block_template->slug ] <= $flag;
+			function($block_template) use ($flag, $block_templates_with_feature_gate) {
+				if (isset($block_templates_with_feature_gate[$block_template->slug])) {
+					return $block_templates_with_feature_gate[$block_template->slug] <= $flag;
 				}
 				return true;
 			}
@@ -532,17 +532,17 @@ 
 	 *
 	 * @return array List of templates with duplicates removed. The customised alternative is preferred over the theme default.
 	 */
-	public static function remove_theme_templates_with_custom_alternative( $templates ) {
+	public static function remove_theme_templates_with_custom_alternative($templates) {
 
 		// Get the slugs of all templates that have been customised and saved in the database.
 		$customised_template_slugs = array_map(
-			function( $template ) {
+			function($template) {
 				return $template->slug;
 			},
 			array_values(
 				array_filter(
 					$templates,
-					function( $template ) {
+					function($template) {
 						// This template has been customised and saved as a post.
 						return 'custom' === $template->source;
 					}
@@ -557,9 +557,9 @@ 
 		return array_values(
 			array_filter(
 				$templates,
-				function( $template ) use ( $customised_template_slugs ) {
+				function($template) use ($customised_template_slugs) {
 					// This template has been customised and saved as a post, so return it.
-					return ! ( 'theme' === $template->source && in_array( $template->slug, $customised_template_slugs, true ) );
+					return !('theme' === $template->source && in_array($template->slug, $customised_template_slugs, true));
 				}
 			)
 		);

plugins/woocommerce/packages/woocommerce-blocks/src/Package.php

Indentation +98 added lines, -98 removed lines

@@ -21,109 +21,109 @@
  */
 class Package {
 
-	/**
-	 * For back compat this is provided. Ideally, you should register your
-	 * class with Automattic\Woocommerce\Blocks\Container and make Package a
-	 * dependency.
-	 *
-	 * @since 2.5.0
-	 * @return Package  The Package instance class
-	 */
-	protected static function get_package() {
-		return self::container()->get( NewPackage::class );
-	}
+    /**
+     * For back compat this is provided. Ideally, you should register your
+     * class with Automattic\Woocommerce\Blocks\Container and make Package a
+     * dependency.
+     *
+     * @since 2.5.0
+     * @return Package  The Package instance class
+     */
+    protected static function get_package() {
+        return self::container()->get( NewPackage::class );
+    }
 
-	/**
-	 * Init the package - load the blocks library and define constants.
-	 *
-	 * @since 2.5.0 Handled by new NewPackage.
-	 */
-	public static function init() {
-		self::container()->get( Bootstrap::class );
-	}
+    /**
+     * Init the package - load the blocks library and define constants.
+     *
+     * @since 2.5.0 Handled by new NewPackage.
+     */
+    public static function init() {
+        self::container()->get( Bootstrap::class );
+    }
 
-	/**
-	 * Return the version of the package.
-	 *
-	 * @return string
-	 */
-	public static function get_version() {
-		return self::get_package()->get_version();
-	}
+    /**
+     * Return the version of the package.
+     *
+     * @return string
+     */
+    public static function get_version() {
+        return self::get_package()->get_version();
+    }
 
-	/**
-	 * Return the path to the package.
-	 *
-	 * @return string
-	 */
-	public static function get_path() {
-		return self::get_package()->get_path();
-	}
+    /**
+     * Return the path to the package.
+     *
+     * @return string
+     */
+    public static function get_path() {
+        return self::get_package()->get_path();
+    }
 
-	/**
-	 * Returns an instance of the the FeatureGating class.
-	 *
-	 * @return FeatureGating
-	 */
-	public static function feature() {
-		return self::get_package()->feature();
-	}
+    /**
+     * Returns an instance of the the FeatureGating class.
+     *
+     * @return FeatureGating
+     */
+    public static function feature() {
+        return self::get_package()->feature();
+    }
 
-	/**
-	 * Checks if we're executing the code in an experimental build mode.
-	 *
-	 * @return boolean
-	 */
-	public static function is_experimental_build() {
-		return self::get_package()->is_experimental_build();
-	}
+    /**
+     * Checks if we're executing the code in an experimental build mode.
+     *
+     * @return boolean
+     */
+    public static function is_experimental_build() {
+        return self::get_package()->is_experimental_build();
+    }
 
-	/**
-	 * Checks if we're executing the code in an feature plugin or experimental build mode.
-	 *
-	 * @return boolean
-	 */
-	public static function is_feature_plugin_build() {
-		return self::get_package()->is_feature_plugin_build();
-	}
+    /**
+     * Checks if we're executing the code in an feature plugin or experimental build mode.
+     *
+     * @return boolean
+     */
+    public static function is_feature_plugin_build() {
+        return self::get_package()->is_feature_plugin_build();
+    }
 
-	/**
-	 * Loads the dependency injection container for woocommerce blocks.
-	 *
-	 * @param boolean $reset Used to reset the container to a fresh instance.
-	 *                       Note: this means all dependencies will be
-	 *                       reconstructed.
-	 */
-	public static function container( $reset = false ) {
-		static $container;
-		if (
-				! $container instanceof Container
-				|| $reset
-			) {
-			$container = new Container();
-			// register Package.
-			$container->register(
-				NewPackage::class,
-				function ( $container ) {
-					// leave for automated version bumping.
-					$version = '8.0.0';
-					return new NewPackage(
-						$version,
-						dirname( __DIR__ ),
-						new FeatureGating()
-					);
-				}
-			);
-			// register Bootstrap.
-			$container->register(
-				Bootstrap::class,
-				function ( $container ) {
-					return new Bootstrap(
-						$container
-					);
-				}
-			);
-		}
-		return $container;
-	}
+    /**
+     * Loads the dependency injection container for woocommerce blocks.
+     *
+     * @param boolean $reset Used to reset the container to a fresh instance.
+     *                       Note: this means all dependencies will be
+     *                       reconstructed.
+     */
+    public static function container( $reset = false ) {
+        static $container;
+        if (
+                ! $container instanceof Container
+                || $reset
+            ) {
+            $container = new Container();
+            // register Package.
+            $container->register(
+                NewPackage::class,
+                function ( $container ) {
+                    // leave for automated version bumping.
+                    $version = '8.0.0';
+                    return new NewPackage(
+                        $version,
+                        dirname( __DIR__ ),
+                        new FeatureGating()
+                    );
+                }
+            );
+            // register Bootstrap.
+            $container->register(
+                Bootstrap::class,
+                function ( $container ) {
+                    return new Bootstrap(
+                        $container
+                    );
+                }
+            );
+        }
+        return $container;
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -30,7 +30,7 @@ 
 	 * @return Package  The Package instance class
 	 */
 	protected static function get_package() {
-		return self::container()->get( NewPackage::class );
+		return self::container()->get(NewPackage::class);
 	}
 
 	/**
@@ -39,7 +39,7 @@ 
 	 * @since 2.5.0 Handled by new NewPackage.
 	 */
 	public static function init() {
-		self::container()->get( Bootstrap::class );
+		self::container()->get(Bootstrap::class);
 	}
 
 	/**
@@ -94,22 +94,22 @@ 
 	 *                       Note: this means all dependencies will be
 	 *                       reconstructed.
 	 */
-	public static function container( $reset = false ) {
+	public static function container($reset = false) {
 		static $container;
 		if (
-				! $container instanceof Container
+				!$container instanceof Container
 				|| $reset
 			) {
 			$container = new Container();
 			// register Package.
 			$container->register(
 				NewPackage::class,
-				function ( $container ) {
+				function($container) {
 					// leave for automated version bumping.
 					$version = '8.0.0';
 					return new NewPackage(
 						$version,
-						dirname( __DIR__ ),
+						dirname(__DIR__),
 						new FeatureGating()
 					);
 				}
@@ -117,7 +117,7 @@ 
 			// register Bootstrap.
 			$container->register(
 				Bootstrap::class,
-				function ( $container ) {
+				function($container) {
 					return new Bootstrap(
 						$container
 					);

plugins/woocommerce/packages/woocommerce-blocks/src/AssetsController.php

Indentation +266 added lines, -266 removed lines

@@ -13,275 +13,275 @@
  */
 final class AssetsController {
 
-	/**
-	 * Asset API interface for various asset registration.
-	 *
-	 * @var AssetApi
-	 */
-	private $api;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param AssetApi $asset_api  Asset API interface for various asset registration.
-	 */
-	public function __construct( AssetApi $asset_api ) {
-		$this->api = $asset_api;
-		$this->init();
-	}
-
-	/**
-	 * Initialize class features.
-	 */
-	protected function init() {
-		add_action( 'init', array( $this, 'register_assets' ) );
-		add_filter( 'wp_resource_hints', array( $this, 'add_resource_hints' ), 10, 2 );
-		add_action( 'body_class', array( $this, 'add_theme_body_class' ), 1 );
-		add_action( 'admin_body_class', array( $this, 'add_theme_body_class' ), 1 );
-		add_action( 'admin_enqueue_scripts', array( $this, 'update_block_style_dependencies' ), 20 );
-		add_action( 'wp_enqueue_scripts', array( $this, 'update_block_settings_dependencies' ), 100 );
-		add_action( 'admin_enqueue_scripts', array( $this, 'update_block_settings_dependencies' ), 100 );
-	}
-
-	/**
-	 * Register block scripts & styles.
-	 */
-	public function register_assets() {
-		$this->register_style( 'wc-blocks-vendors-style', plugins_url( $this->api->get_block_asset_build_path( 'wc-blocks-vendors-style', 'css' ), __DIR__ ) );
-		$this->register_style( 'wc-blocks-editor-style', plugins_url( $this->api->get_block_asset_build_path( 'wc-blocks-editor-style', 'css' ), __DIR__ ), [ 'wp-edit-blocks' ], 'all', true );
-		$this->register_style( 'wc-blocks-style', plugins_url( $this->api->get_block_asset_build_path( 'wc-blocks-style', 'css' ), __DIR__ ), [ 'wc-blocks-vendors-style' ], 'all', true );
-
-		$this->api->register_script( 'wc-blocks-middleware', 'build/wc-blocks-middleware.js', [], false );
-		$this->api->register_script( 'wc-blocks-data-store', 'build/wc-blocks-data.js', [ 'wc-blocks-middleware' ] );
-		$this->api->register_script( 'wc-blocks-vendors', $this->api->get_block_asset_build_path( 'wc-blocks-vendors' ), [], false );
-		$this->api->register_script( 'wc-blocks-registry', 'build/wc-blocks-registry.js', [], false );
-		$this->api->register_script( 'wc-blocks', $this->api->get_block_asset_build_path( 'wc-blocks' ), [ 'wc-blocks-vendors' ], false );
-		$this->api->register_script( 'wc-blocks-shared-context', 'build/wc-blocks-shared-context.js', [] );
-		$this->api->register_script( 'wc-blocks-shared-hocs', 'build/wc-blocks-shared-hocs.js', [], false );
-
-		// The price package is shared externally so has no blocks prefix.
-		$this->api->register_script( 'wc-price-format', 'build/price-format.js', [], false );
-
-		$this->api->register_script( 'wc-blocks-checkout', 'build/blocks-checkout.js', [] );
-
-		wp_add_inline_script(
-			'wc-blocks-middleware',
-			"
+    /**
+     * Asset API interface for various asset registration.
+     *
+     * @var AssetApi
+     */
+    private $api;
+
+    /**
+     * Constructor.
+     *
+     * @param AssetApi $asset_api  Asset API interface for various asset registration.
+     */
+    public function __construct( AssetApi $asset_api ) {
+        $this->api = $asset_api;
+        $this->init();
+    }
+
+    /**
+     * Initialize class features.
+     */
+    protected function init() {
+        add_action( 'init', array( $this, 'register_assets' ) );
+        add_filter( 'wp_resource_hints', array( $this, 'add_resource_hints' ), 10, 2 );
+        add_action( 'body_class', array( $this, 'add_theme_body_class' ), 1 );
+        add_action( 'admin_body_class', array( $this, 'add_theme_body_class' ), 1 );
+        add_action( 'admin_enqueue_scripts', array( $this, 'update_block_style_dependencies' ), 20 );
+        add_action( 'wp_enqueue_scripts', array( $this, 'update_block_settings_dependencies' ), 100 );
+        add_action( 'admin_enqueue_scripts', array( $this, 'update_block_settings_dependencies' ), 100 );
+    }
+
+    /**
+     * Register block scripts & styles.
+     */
+    public function register_assets() {
+        $this->register_style( 'wc-blocks-vendors-style', plugins_url( $this->api->get_block_asset_build_path( 'wc-blocks-vendors-style', 'css' ), __DIR__ ) );
+        $this->register_style( 'wc-blocks-editor-style', plugins_url( $this->api->get_block_asset_build_path( 'wc-blocks-editor-style', 'css' ), __DIR__ ), [ 'wp-edit-blocks' ], 'all', true );
+        $this->register_style( 'wc-blocks-style', plugins_url( $this->api->get_block_asset_build_path( 'wc-blocks-style', 'css' ), __DIR__ ), [ 'wc-blocks-vendors-style' ], 'all', true );
+
+        $this->api->register_script( 'wc-blocks-middleware', 'build/wc-blocks-middleware.js', [], false );
+        $this->api->register_script( 'wc-blocks-data-store', 'build/wc-blocks-data.js', [ 'wc-blocks-middleware' ] );
+        $this->api->register_script( 'wc-blocks-vendors', $this->api->get_block_asset_build_path( 'wc-blocks-vendors' ), [], false );
+        $this->api->register_script( 'wc-blocks-registry', 'build/wc-blocks-registry.js', [], false );
+        $this->api->register_script( 'wc-blocks', $this->api->get_block_asset_build_path( 'wc-blocks' ), [ 'wc-blocks-vendors' ], false );
+        $this->api->register_script( 'wc-blocks-shared-context', 'build/wc-blocks-shared-context.js', [] );
+        $this->api->register_script( 'wc-blocks-shared-hocs', 'build/wc-blocks-shared-hocs.js', [], false );
+
+        // The price package is shared externally so has no blocks prefix.
+        $this->api->register_script( 'wc-price-format', 'build/price-format.js', [], false );
+
+        $this->api->register_script( 'wc-blocks-checkout', 'build/blocks-checkout.js', [] );
+
+        wp_add_inline_script(
+            'wc-blocks-middleware',
+            "
 			var wcBlocksMiddlewareConfig = {
 				storeApiNonce: '" . esc_js( wp_create_nonce( 'wc_store_api' ) ) . "',
 				wcStoreApiNonceTimestamp: '" . esc_js( time() ) . "'
 			};
 			",
-			'before'
-		);
-	}
-
-	/**
-	 * Defines resource hints to help speed up the loading of some critical blocks.
-	 *
-	 * These will not impact page loading times negatively because they are loaded once the current page is idle.
-	 *
-	 * @param array  $urls          URLs to print for resource hints. Each URL is an array of resource attributes, or a URL string.
-	 * @param string $relation_type The relation type the URLs are printed. Possible values: preconnect, dns-prefetch, prefetch, prerender.
-	 * @return array URLs to print for resource hints.
-	 */
-	public function add_resource_hints( $urls, $relation_type ) {
-		if ( ! Package::feature()->is_feature_plugin_build() || ! in_array( $relation_type, [ 'prefetch', 'prerender' ], true ) ) {
-			return $urls;
-		}
-
-		// We only need to prefetch when the cart has contents.
-		$cart = wc()->cart;
-
-		if ( ! $cart || ! $cart instanceof \WC_Cart || 0 === $cart->get_cart_contents_count() ) {
-			return $urls;
-		}
-
-		$resources         = [];
-		$is_block_cart     = has_block( 'woocommerce/cart' );
-		$is_block_checkout = has_block( 'woocommerce/checkout' );
-
-		if ( 'prefetch' === $relation_type ) {
-			if ( ! $is_block_cart ) {
-				$resources = array_merge( $resources, $this->get_block_asset_resource_hints( 'cart-frontend' ) );
-			}
-
-			if ( ! $is_block_checkout ) {
-				$resources = array_merge( $resources, $this->get_block_asset_resource_hints( 'checkout-frontend' ) );
-			}
-
-			$urls = array_merge(
-				$urls,
-				array_map(
-					function( $src ) {
-						return array(
-							'href' => $src,
-							'as'   => 'script',
-						);
-					},
-					array_unique( array_filter( $resources ) )
-				)
-			);
-		}
-
-		if ( 'prerender' === $relation_type && $is_block_cart ) {
-			$checkout_page_id  = wc_get_page_id( 'checkout' );
-			$checkout_page_url = $checkout_page_id ? get_permalink( $checkout_page_id ) : '';
-			if ( $checkout_page_url ) {
-				$urls[] = $checkout_page_url;
-			}
-		}
-
-		return $urls;
-	}
-
-	/**
-	 * Get resource hint for a block by name.
-	 *
-	 * @param string $filename Block filename.
-	 * @return array
-	 */
-	private function get_block_asset_resource_hints( $filename = '' ) {
-		if ( ! $filename ) {
-			return [];
-		}
-		$script_data = $this->api->get_script_data(
-			$this->api->get_block_asset_build_path( $filename )
-		);
-		return array_merge( [ add_query_arg( 'ver', $script_data['version'], $script_data['src'] ) ], $this->get_script_dependency_src_array( $script_data['dependencies'] ) );
-	}
-
-	/**
-	 * Get the src of all script dependencies (handles).
-	 *
-	 * @param array $dependencies Array of dependency handles.
-	 * @return string[] Array of src strings.
-	 */
-	private function get_script_dependency_src_array( array $dependencies ) {
-		$wp_scripts = wp_scripts();
-		return array_reduce(
-			$dependencies,
-			function( $src, $handle ) use ( $wp_scripts ) {
-				if ( isset( $wp_scripts->registered[ $handle ] ) ) {
-					$src[] = add_query_arg( 'ver', $wp_scripts->registered[ $handle ]->ver, $wp_scripts->registered[ $handle ]->src );
-					$src   = array_merge( $src, $this->get_script_dependency_src_array( $wp_scripts->registered[ $handle ]->deps ) );
-				}
-				return $src;
-			},
-			[]
-		);
-	}
-
-	/**
-	 * Add body classes to the frontend and within admin.
-	 *
-	 * @param string|array $classes Array or string of CSS classnames.
-	 * @return string|array Modified classnames.
-	 */
-	public function add_theme_body_class( $classes ) {
-		$class = 'theme-' . get_template();
-
-		if ( is_array( $classes ) ) {
-			$classes[] = $class;
-		} else {
-			$classes .= ' ' . $class . ' ';
-		}
-
-		return $classes;
-	}
-
-	/**
-	 * Get the file modified time as a cache buster if we're in dev mode.
-	 *
-	 * @param string $file Local path to the file.
-	 * @return string The cache buster value to use for the given file.
-	 */
-	protected function get_file_version( $file ) {
-		if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG && file_exists( \Automattic\WooCommerce\Blocks\Package::get_path() . $file ) ) {
-			return filemtime( \Automattic\WooCommerce\Blocks\Package::get_path() . $file );
-		}
-		return \Automattic\WooCommerce\Blocks\Package::get_version();
-	}
-
-	/**
-	 * Registers a style according to `wp_register_style`.
-	 *
-	 * @param string  $handle Name of the stylesheet. Should be unique.
-	 * @param string  $src    Full URL of the stylesheet, or path of the stylesheet relative to the WordPress root directory.
-	 * @param array   $deps   Optional. An array of registered stylesheet handles this stylesheet depends on. Default empty array.
-	 * @param string  $media  Optional. The media for which this stylesheet has been defined. Default 'all'. Accepts media types like
-	 *                        'all', 'print' and 'screen', or media queries like '(orientation: portrait)' and '(max-width: 640px)'.
-	 * @param boolean $rtl   Optional. Whether or not to register RTL styles.
-	 */
-	protected function register_style( $handle, $src, $deps = [], $media = 'all', $rtl = false ) {
-		$filename = str_replace( plugins_url( '/', __DIR__ ), '', $src );
-		$ver      = self::get_file_version( $filename );
-
-		wp_register_style( $handle, $src, $deps, $ver, $media );
-
-		if ( $rtl ) {
-			wp_style_add_data( $handle, 'rtl', 'replace' );
-		}
-	}
-
-	/**
-	 * Update block style dependencies after they have been registered.
-	 */
-	public function update_block_style_dependencies() {
-		$wp_styles = wp_styles();
-		$style     = $wp_styles->query( 'wc-blocks-style', 'registered' );
-
-		if ( ! $style ) {
-			return;
-		}
-
-		// In WC < 5.5, `woocommerce-general` is not registered in block editor
-		// screens, so we don't add it as a dependency if it's not registered.
-		// In WC >= 5.5, `woocommerce-general` is registered on `admin_enqueue_scripts`,
-		// so we need to check if it's registered here instead of on `init`.
-		if (
-			wp_style_is( 'woocommerce-general', 'registered' ) &&
-			! in_array( 'woocommerce-general', $style->deps, true )
-		) {
-			$style->deps[] = 'woocommerce-general';
-		}
-	}
-
-	/**
-	 * Fix scripts with wc-settings dependency.
-	 *
-	 * The wc-settings script only works correctly when enqueued in the footer. This is to give blocks etc time to
-	 * register their settings data before it's printed.
-	 *
-	 * This code will look at registered scripts, and if they have a wc-settings dependency, force them to print in the
-	 * footer instead of the header.
-	 *
-	 * This only supports packages known to require wc-settings!
-	 *
-	 * @see https://github.com/woocommerce/woocommerce-gutenberg-products-block/issues/5052
-	 */
-	public function update_block_settings_dependencies() {
-		$wp_scripts     = wp_scripts();
-		$known_packages = [ 'wc-settings', 'wc-blocks-checkout', 'wc-price-format' ];
-
-		foreach ( $wp_scripts->registered as $handle => $script ) {
-			// scripts that are loaded in the footer has extra->group = 1.
-			if ( array_intersect( $known_packages, $script->deps ) && ! isset( $script->extra['group'] ) ) {
-				// Append the script to footer.
-				$wp_scripts->add_data( $handle, 'group', 1 );
-				// Show a warning.
-				$error_handle  = 'wc-settings-dep-in-header';
-				$used_deps     = implode( ', ', array_intersect( $known_packages, $script->deps ) );
-				$error_message = "Scripts that have a dependency on [$used_deps] must be loaded in the footer, {$handle} was registered to load in the header, but has been switched to load in the footer instead. See https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5059";
-				// phpcs:ignore WordPress.WP.EnqueuedResourceParameters.NotInFooter,WordPress.WP.EnqueuedResourceParameters.MissingVersion
-				wp_register_script( $error_handle, '' );
-				wp_enqueue_script( $error_handle );
-				wp_add_inline_script(
-					$error_handle,
-					sprintf( 'console.warn( "%s" );', $error_message )
-				);
-
-			}
-		}
-	}
+            'before'
+        );
+    }
+
+    /**
+     * Defines resource hints to help speed up the loading of some critical blocks.
+     *
+     * These will not impact page loading times negatively because they are loaded once the current page is idle.
+     *
+     * @param array  $urls          URLs to print for resource hints. Each URL is an array of resource attributes, or a URL string.
+     * @param string $relation_type The relation type the URLs are printed. Possible values: preconnect, dns-prefetch, prefetch, prerender.
+     * @return array URLs to print for resource hints.
+     */
+    public function add_resource_hints( $urls, $relation_type ) {
+        if ( ! Package::feature()->is_feature_plugin_build() || ! in_array( $relation_type, [ 'prefetch', 'prerender' ], true ) ) {
+            return $urls;
+        }
+
+        // We only need to prefetch when the cart has contents.
+        $cart = wc()->cart;
+
+        if ( ! $cart || ! $cart instanceof \WC_Cart || 0 === $cart->get_cart_contents_count() ) {
+            return $urls;
+        }
+
+        $resources         = [];
+        $is_block_cart     = has_block( 'woocommerce/cart' );
+        $is_block_checkout = has_block( 'woocommerce/checkout' );
+
+        if ( 'prefetch' === $relation_type ) {
+            if ( ! $is_block_cart ) {
+                $resources = array_merge( $resources, $this->get_block_asset_resource_hints( 'cart-frontend' ) );
+            }
+
+            if ( ! $is_block_checkout ) {
+                $resources = array_merge( $resources, $this->get_block_asset_resource_hints( 'checkout-frontend' ) );
+            }
+
+            $urls = array_merge(
+                $urls,
+                array_map(
+                    function( $src ) {
+                        return array(
+                            'href' => $src,
+                            'as'   => 'script',
+                        );
+                    },
+                    array_unique( array_filter( $resources ) )
+                )
+            );
+        }
+
+        if ( 'prerender' === $relation_type && $is_block_cart ) {
+            $checkout_page_id  = wc_get_page_id( 'checkout' );
+            $checkout_page_url = $checkout_page_id ? get_permalink( $checkout_page_id ) : '';
+            if ( $checkout_page_url ) {
+                $urls[] = $checkout_page_url;
+            }
+        }
+
+        return $urls;
+    }
+
+    /**
+     * Get resource hint for a block by name.
+     *
+     * @param string $filename Block filename.
+     * @return array
+     */
+    private function get_block_asset_resource_hints( $filename = '' ) {
+        if ( ! $filename ) {
+            return [];
+        }
+        $script_data = $this->api->get_script_data(
+            $this->api->get_block_asset_build_path( $filename )
+        );
+        return array_merge( [ add_query_arg( 'ver', $script_data['version'], $script_data['src'] ) ], $this->get_script_dependency_src_array( $script_data['dependencies'] ) );
+    }
+
+    /**
+     * Get the src of all script dependencies (handles).
+     *
+     * @param array $dependencies Array of dependency handles.
+     * @return string[] Array of src strings.
+     */
+    private function get_script_dependency_src_array( array $dependencies ) {
+        $wp_scripts = wp_scripts();
+        return array_reduce(
+            $dependencies,
+            function( $src, $handle ) use ( $wp_scripts ) {
+                if ( isset( $wp_scripts->registered[ $handle ] ) ) {
+                    $src[] = add_query_arg( 'ver', $wp_scripts->registered[ $handle ]->ver, $wp_scripts->registered[ $handle ]->src );
+                    $src   = array_merge( $src, $this->get_script_dependency_src_array( $wp_scripts->registered[ $handle ]->deps ) );
+                }
+                return $src;
+            },
+            []
+        );
+    }
+
+    /**
+     * Add body classes to the frontend and within admin.
+     *
+     * @param string|array $classes Array or string of CSS classnames.
+     * @return string|array Modified classnames.
+     */
+    public function add_theme_body_class( $classes ) {
+        $class = 'theme-' . get_template();
+
+        if ( is_array( $classes ) ) {
+            $classes[] = $class;
+        } else {
+            $classes .= ' ' . $class . ' ';
+        }
+
+        return $classes;
+    }
+
+    /**
+     * Get the file modified time as a cache buster if we're in dev mode.
+     *
+     * @param string $file Local path to the file.
+     * @return string The cache buster value to use for the given file.
+     */
+    protected function get_file_version( $file ) {
+        if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG && file_exists( \Automattic\WooCommerce\Blocks\Package::get_path() . $file ) ) {
+            return filemtime( \Automattic\WooCommerce\Blocks\Package::get_path() . $file );
+        }
+        return \Automattic\WooCommerce\Blocks\Package::get_version();
+    }
+
+    /**
+     * Registers a style according to `wp_register_style`.
+     *
+     * @param string  $handle Name of the stylesheet. Should be unique.
+     * @param string  $src    Full URL of the stylesheet, or path of the stylesheet relative to the WordPress root directory.
+     * @param array   $deps   Optional. An array of registered stylesheet handles this stylesheet depends on. Default empty array.
+     * @param string  $media  Optional. The media for which this stylesheet has been defined. Default 'all'. Accepts media types like
+     *                        'all', 'print' and 'screen', or media queries like '(orientation: portrait)' and '(max-width: 640px)'.
+     * @param boolean $rtl   Optional. Whether or not to register RTL styles.
+     */
+    protected function register_style( $handle, $src, $deps = [], $media = 'all', $rtl = false ) {
+        $filename = str_replace( plugins_url( '/', __DIR__ ), '', $src );
+        $ver      = self::get_file_version( $filename );
+
+        wp_register_style( $handle, $src, $deps, $ver, $media );
+
+        if ( $rtl ) {
+            wp_style_add_data( $handle, 'rtl', 'replace' );
+        }
+    }
+
+    /**
+     * Update block style dependencies after they have been registered.
+     */
+    public function update_block_style_dependencies() {
+        $wp_styles = wp_styles();
+        $style     = $wp_styles->query( 'wc-blocks-style', 'registered' );
+
+        if ( ! $style ) {
+            return;
+        }
+
+        // In WC < 5.5, `woocommerce-general` is not registered in block editor
+        // screens, so we don't add it as a dependency if it's not registered.
+        // In WC >= 5.5, `woocommerce-general` is registered on `admin_enqueue_scripts`,
+        // so we need to check if it's registered here instead of on `init`.
+        if (
+            wp_style_is( 'woocommerce-general', 'registered' ) &&
+            ! in_array( 'woocommerce-general', $style->deps, true )
+        ) {
+            $style->deps[] = 'woocommerce-general';
+        }
+    }
+
+    /**
+     * Fix scripts with wc-settings dependency.
+     *
+     * The wc-settings script only works correctly when enqueued in the footer. This is to give blocks etc time to
+     * register their settings data before it's printed.
+     *
+     * This code will look at registered scripts, and if they have a wc-settings dependency, force them to print in the
+     * footer instead of the header.
+     *
+     * This only supports packages known to require wc-settings!
+     *
+     * @see https://github.com/woocommerce/woocommerce-gutenberg-products-block/issues/5052
+     */
+    public function update_block_settings_dependencies() {
+        $wp_scripts     = wp_scripts();
+        $known_packages = [ 'wc-settings', 'wc-blocks-checkout', 'wc-price-format' ];
+
+        foreach ( $wp_scripts->registered as $handle => $script ) {
+            // scripts that are loaded in the footer has extra->group = 1.
+            if ( array_intersect( $known_packages, $script->deps ) && ! isset( $script->extra['group'] ) ) {
+                // Append the script to footer.
+                $wp_scripts->add_data( $handle, 'group', 1 );
+                // Show a warning.
+                $error_handle  = 'wc-settings-dep-in-header';
+                $used_deps     = implode( ', ', array_intersect( $known_packages, $script->deps ) );
+                $error_message = "Scripts that have a dependency on [$used_deps] must be loaded in the footer, {$handle} was registered to load in the header, but has been switched to load in the footer instead. See https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5059";
+                // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.NotInFooter,WordPress.WP.EnqueuedResourceParameters.MissingVersion
+                wp_register_script( $error_handle, '' );
+                wp_enqueue_script( $error_handle );
+                wp_add_inline_script(
+                    $error_handle,
+                    sprintf( 'console.warn( "%s" );', $error_message )
+                );
+
+            }
+        }
+    }
 }

Spacing +71 added lines, -71 removed lines

@@ -25,7 +25,7 @@ 
 	 *
 	 * @param AssetApi $asset_api  Asset API interface for various asset registration.
 	 */
-	public function __construct( AssetApi $asset_api ) {
+	public function __construct(AssetApi $asset_api) {
 		$this->api = $asset_api;
 		$this->init();
 	}
@@ -34,42 +34,42 @@ 
 	 * Initialize class features.
 	 */
 	protected function init() {
-		add_action( 'init', array( $this, 'register_assets' ) );
-		add_filter( 'wp_resource_hints', array( $this, 'add_resource_hints' ), 10, 2 );
-		add_action( 'body_class', array( $this, 'add_theme_body_class' ), 1 );
-		add_action( 'admin_body_class', array( $this, 'add_theme_body_class' ), 1 );
-		add_action( 'admin_enqueue_scripts', array( $this, 'update_block_style_dependencies' ), 20 );
-		add_action( 'wp_enqueue_scripts', array( $this, 'update_block_settings_dependencies' ), 100 );
-		add_action( 'admin_enqueue_scripts', array( $this, 'update_block_settings_dependencies' ), 100 );
+		add_action('init', array($this, 'register_assets'));
+		add_filter('wp_resource_hints', array($this, 'add_resource_hints'), 10, 2);
+		add_action('body_class', array($this, 'add_theme_body_class'), 1);
+		add_action('admin_body_class', array($this, 'add_theme_body_class'), 1);
+		add_action('admin_enqueue_scripts', array($this, 'update_block_style_dependencies'), 20);
+		add_action('wp_enqueue_scripts', array($this, 'update_block_settings_dependencies'), 100);
+		add_action('admin_enqueue_scripts', array($this, 'update_block_settings_dependencies'), 100);
 	}
 
 	/**
 	 * Register block scripts & styles.
 	 */
 	public function register_assets() {
-		$this->register_style( 'wc-blocks-vendors-style', plugins_url( $this->api->get_block_asset_build_path( 'wc-blocks-vendors-style', 'css' ), __DIR__ ) );
-		$this->register_style( 'wc-blocks-editor-style', plugins_url( $this->api->get_block_asset_build_path( 'wc-blocks-editor-style', 'css' ), __DIR__ ), [ 'wp-edit-blocks' ], 'all', true );
-		$this->register_style( 'wc-blocks-style', plugins_url( $this->api->get_block_asset_build_path( 'wc-blocks-style', 'css' ), __DIR__ ), [ 'wc-blocks-vendors-style' ], 'all', true );
-
-		$this->api->register_script( 'wc-blocks-middleware', 'build/wc-blocks-middleware.js', [], false );
-		$this->api->register_script( 'wc-blocks-data-store', 'build/wc-blocks-data.js', [ 'wc-blocks-middleware' ] );
-		$this->api->register_script( 'wc-blocks-vendors', $this->api->get_block_asset_build_path( 'wc-blocks-vendors' ), [], false );
-		$this->api->register_script( 'wc-blocks-registry', 'build/wc-blocks-registry.js', [], false );
-		$this->api->register_script( 'wc-blocks', $this->api->get_block_asset_build_path( 'wc-blocks' ), [ 'wc-blocks-vendors' ], false );
-		$this->api->register_script( 'wc-blocks-shared-context', 'build/wc-blocks-shared-context.js', [] );
-		$this->api->register_script( 'wc-blocks-shared-hocs', 'build/wc-blocks-shared-hocs.js', [], false );
+		$this->register_style('wc-blocks-vendors-style', plugins_url($this->api->get_block_asset_build_path('wc-blocks-vendors-style', 'css'), __DIR__));
+		$this->register_style('wc-blocks-editor-style', plugins_url($this->api->get_block_asset_build_path('wc-blocks-editor-style', 'css'), __DIR__), ['wp-edit-blocks'], 'all', true);
+		$this->register_style('wc-blocks-style', plugins_url($this->api->get_block_asset_build_path('wc-blocks-style', 'css'), __DIR__), ['wc-blocks-vendors-style'], 'all', true);
+
+		$this->api->register_script('wc-blocks-middleware', 'build/wc-blocks-middleware.js', [], false);
+		$this->api->register_script('wc-blocks-data-store', 'build/wc-blocks-data.js', ['wc-blocks-middleware']);
+		$this->api->register_script('wc-blocks-vendors', $this->api->get_block_asset_build_path('wc-blocks-vendors'), [], false);
+		$this->api->register_script('wc-blocks-registry', 'build/wc-blocks-registry.js', [], false);
+		$this->api->register_script('wc-blocks', $this->api->get_block_asset_build_path('wc-blocks'), ['wc-blocks-vendors'], false);
+		$this->api->register_script('wc-blocks-shared-context', 'build/wc-blocks-shared-context.js', []);
+		$this->api->register_script('wc-blocks-shared-hocs', 'build/wc-blocks-shared-hocs.js', [], false);
 
 		// The price package is shared externally so has no blocks prefix.
-		$this->api->register_script( 'wc-price-format', 'build/price-format.js', [], false );
+		$this->api->register_script('wc-price-format', 'build/price-format.js', [], false);
 
-		$this->api->register_script( 'wc-blocks-checkout', 'build/blocks-checkout.js', [] );
+		$this->api->register_script('wc-blocks-checkout', 'build/blocks-checkout.js', []);
 
 		wp_add_inline_script(
 			'wc-blocks-middleware',
 			"
 			var wcBlocksMiddlewareConfig = {
-				storeApiNonce: '" . esc_js( wp_create_nonce( 'wc_store_api' ) ) . "',
-				wcStoreApiNonceTimestamp: '" . esc_js( time() ) . "'
+				storeApiNonce: '" . esc_js(wp_create_nonce('wc_store_api')) . "',
+				wcStoreApiNonceTimestamp: '" . esc_js(time()) . "'
 			};
 			",
 			'before'
@@ -85,49 +85,49 @@ 
 	 * @param string $relation_type The relation type the URLs are printed. Possible values: preconnect, dns-prefetch, prefetch, prerender.
 	 * @return array URLs to print for resource hints.
 	 */
-	public function add_resource_hints( $urls, $relation_type ) {
-		if ( ! Package::feature()->is_feature_plugin_build() || ! in_array( $relation_type, [ 'prefetch', 'prerender' ], true ) ) {
+	public function add_resource_hints($urls, $relation_type) {
+		if (!Package::feature()->is_feature_plugin_build() || !in_array($relation_type, ['prefetch', 'prerender'], true)) {
 			return $urls;
 		}
 
 		// We only need to prefetch when the cart has contents.
 		$cart = wc()->cart;
 
-		if ( ! $cart || ! $cart instanceof \WC_Cart || 0 === $cart->get_cart_contents_count() ) {
+		if (!$cart || !$cart instanceof \WC_Cart || 0 === $cart->get_cart_contents_count()) {
 			return $urls;
 		}
 
 		$resources         = [];
-		$is_block_cart     = has_block( 'woocommerce/cart' );
-		$is_block_checkout = has_block( 'woocommerce/checkout' );
+		$is_block_cart     = has_block('woocommerce/cart');
+		$is_block_checkout = has_block('woocommerce/checkout');
 
-		if ( 'prefetch' === $relation_type ) {
-			if ( ! $is_block_cart ) {
-				$resources = array_merge( $resources, $this->get_block_asset_resource_hints( 'cart-frontend' ) );
+		if ('prefetch' === $relation_type) {
+			if (!$is_block_cart) {
+				$resources = array_merge($resources, $this->get_block_asset_resource_hints('cart-frontend'));
 			}
 
-			if ( ! $is_block_checkout ) {
-				$resources = array_merge( $resources, $this->get_block_asset_resource_hints( 'checkout-frontend' ) );
+			if (!$is_block_checkout) {
+				$resources = array_merge($resources, $this->get_block_asset_resource_hints('checkout-frontend'));
 			}
 
 			$urls = array_merge(
 				$urls,
 				array_map(
-					function( $src ) {
+					function($src) {
 						return array(
 							'href' => $src,
 							'as'   => 'script',
 						);
 					},
-					array_unique( array_filter( $resources ) )
+					array_unique(array_filter($resources))
 				)
 			);
 		}
 
-		if ( 'prerender' === $relation_type && $is_block_cart ) {
-			$checkout_page_id  = wc_get_page_id( 'checkout' );
-			$checkout_page_url = $checkout_page_id ? get_permalink( $checkout_page_id ) : '';
-			if ( $checkout_page_url ) {
+		if ('prerender' === $relation_type && $is_block_cart) {
+			$checkout_page_id  = wc_get_page_id('checkout');
+			$checkout_page_url = $checkout_page_id ? get_permalink($checkout_page_id) : '';
+			if ($checkout_page_url) {
 				$urls[] = $checkout_page_url;
 			}
 		}
@@ -141,14 +141,14 @@ 
 	 * @param string $filename Block filename.
 	 * @return array
 	 */
-	private function get_block_asset_resource_hints( $filename = '' ) {
-		if ( ! $filename ) {
+	private function get_block_asset_resource_hints($filename = '') {
+		if (!$filename) {
 			return [];
 		}
 		$script_data = $this->api->get_script_data(
-			$this->api->get_block_asset_build_path( $filename )
+			$this->api->get_block_asset_build_path($filename)
 		);
-		return array_merge( [ add_query_arg( 'ver', $script_data['version'], $script_data['src'] ) ], $this->get_script_dependency_src_array( $script_data['dependencies'] ) );
+		return array_merge([add_query_arg('ver', $script_data['version'], $script_data['src'])], $this->get_script_dependency_src_array($script_data['dependencies']));
 	}
 
 	/**
@@ -157,14 +157,14 @@ 
 	 * @param array $dependencies Array of dependency handles.
 	 * @return string[] Array of src strings.
 	 */
-	private function get_script_dependency_src_array( array $dependencies ) {
+	private function get_script_dependency_src_array(array $dependencies) {
 		$wp_scripts = wp_scripts();
 		return array_reduce(
 			$dependencies,
-			function( $src, $handle ) use ( $wp_scripts ) {
-				if ( isset( $wp_scripts->registered[ $handle ] ) ) {
-					$src[] = add_query_arg( 'ver', $wp_scripts->registered[ $handle ]->ver, $wp_scripts->registered[ $handle ]->src );
-					$src   = array_merge( $src, $this->get_script_dependency_src_array( $wp_scripts->registered[ $handle ]->deps ) );
+			function($src, $handle) use ($wp_scripts) {
+				if (isset($wp_scripts->registered[$handle])) {
+					$src[] = add_query_arg('ver', $wp_scripts->registered[$handle]->ver, $wp_scripts->registered[$handle]->src);
+					$src   = array_merge($src, $this->get_script_dependency_src_array($wp_scripts->registered[$handle]->deps));
 				}
 				return $src;
 			},
@@ -178,10 +178,10 @@ 
 	 * @param string|array $classes Array or string of CSS classnames.
 	 * @return string|array Modified classnames.
 	 */
-	public function add_theme_body_class( $classes ) {
+	public function add_theme_body_class($classes) {
 		$class = 'theme-' . get_template();
 
-		if ( is_array( $classes ) ) {
+		if (is_array($classes)) {
 			$classes[] = $class;
 		} else {
 			$classes .= ' ' . $class . ' ';
@@ -196,9 +196,9 @@ 
 	 * @param string $file Local path to the file.
 	 * @return string The cache buster value to use for the given file.
 	 */
-	protected function get_file_version( $file ) {
-		if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG && file_exists( \Automattic\WooCommerce\Blocks\Package::get_path() . $file ) ) {
-			return filemtime( \Automattic\WooCommerce\Blocks\Package::get_path() . $file );
+	protected function get_file_version($file) {
+		if (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG && file_exists(\Automattic\WooCommerce\Blocks\Package::get_path() . $file)) {
+			return filemtime(\Automattic\WooCommerce\Blocks\Package::get_path() . $file);
 		}
 		return \Automattic\WooCommerce\Blocks\Package::get_version();
 	}
@@ -213,14 +213,14 @@ 
 	 *                        'all', 'print' and 'screen', or media queries like '(orientation: portrait)' and '(max-width: 640px)'.
 	 * @param boolean $rtl   Optional. Whether or not to register RTL styles.
 	 */
-	protected function register_style( $handle, $src, $deps = [], $media = 'all', $rtl = false ) {
-		$filename = str_replace( plugins_url( '/', __DIR__ ), '', $src );
-		$ver      = self::get_file_version( $filename );
+	protected function register_style($handle, $src, $deps = [], $media = 'all', $rtl = false) {
+		$filename = str_replace(plugins_url('/', __DIR__), '', $src);
+		$ver      = self::get_file_version($filename);
 
-		wp_register_style( $handle, $src, $deps, $ver, $media );
+		wp_register_style($handle, $src, $deps, $ver, $media);
 
-		if ( $rtl ) {
-			wp_style_add_data( $handle, 'rtl', 'replace' );
+		if ($rtl) {
+			wp_style_add_data($handle, 'rtl', 'replace');
 		}
 	}
 
@@ -229,9 +229,9 @@ 
 	 */
 	public function update_block_style_dependencies() {
 		$wp_styles = wp_styles();
-		$style     = $wp_styles->query( 'wc-blocks-style', 'registered' );
+		$style     = $wp_styles->query('wc-blocks-style', 'registered');
 
-		if ( ! $style ) {
+		if (!$style) {
 			return;
 		}
 
@@ -240,8 +240,8 @@ 
 		// In WC >= 5.5, `woocommerce-general` is registered on `admin_enqueue_scripts`,
 		// so we need to check if it's registered here instead of on `init`.
 		if (
-			wp_style_is( 'woocommerce-general', 'registered' ) &&
-			! in_array( 'woocommerce-general', $style->deps, true )
+			wp_style_is('woocommerce-general', 'registered') &&
+			!in_array('woocommerce-general', $style->deps, true)
 		) {
 			$style->deps[] = 'woocommerce-general';
 		}
@@ -262,23 +262,23 @@ 
 	 */
 	public function update_block_settings_dependencies() {
 		$wp_scripts     = wp_scripts();
-		$known_packages = [ 'wc-settings', 'wc-blocks-checkout', 'wc-price-format' ];
+		$known_packages = ['wc-settings', 'wc-blocks-checkout', 'wc-price-format'];
 
-		foreach ( $wp_scripts->registered as $handle => $script ) {
+		foreach ($wp_scripts->registered as $handle => $script) {
 			// scripts that are loaded in the footer has extra->group = 1.
-			if ( array_intersect( $known_packages, $script->deps ) && ! isset( $script->extra['group'] ) ) {
+			if (array_intersect($known_packages, $script->deps) && !isset($script->extra['group'])) {
 				// Append the script to footer.
-				$wp_scripts->add_data( $handle, 'group', 1 );
+				$wp_scripts->add_data($handle, 'group', 1);
 				// Show a warning.
 				$error_handle  = 'wc-settings-dep-in-header';
-				$used_deps     = implode( ', ', array_intersect( $known_packages, $script->deps ) );
+				$used_deps     = implode(', ', array_intersect($known_packages, $script->deps));
 				$error_message = "Scripts that have a dependency on [$used_deps] must be loaded in the footer, {$handle} was registered to load in the header, but has been switched to load in the footer instead. See https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5059";
 				// phpcs:ignore WordPress.WP.EnqueuedResourceParameters.NotInFooter,WordPress.WP.EnqueuedResourceParameters.MissingVersion
-				wp_register_script( $error_handle, '' );
-				wp_enqueue_script( $error_handle );
+				wp_register_script($error_handle, '');
+				wp_enqueue_script($error_handle);
 				wp_add_inline_script(
 					$error_handle,
-					sprintf( 'console.warn( "%s" );', $error_message )
+					sprintf('console.warn( "%s" );', $error_message)
 				);
 
 			}