generator-chisel 2.1.2 → 2.2.0

package/lib/commands/create/creators/app/chisel-starter-theme/inc/{Plugin → Plugins}/Yoast.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace Chisel\Plugin;
+namespace Chisel\Plugins;
 
 use Chisel\Interfaces\InstanceInterface;
 use Chisel\Interfaces\HooksInterface;
 use Chisel\Traits\Singleton;
-use Chisel\Helper\YoastHelpers;
+use Chisel\Helpers\YoastHelpers;
 
 /**
  * Yoast SEO plugin related functionalities.
  *
  * @package Chisel
  */
-class Yoast implements InstanceInterface, HooksInterface {
+final class Yoast implements InstanceInterface, HooksInterface {
 
 	use Singleton;
 
@@ -32,15 +32,15 @@ class Yoast implements InstanceInterface, HooksInterface {
 	/**
 	 * Set properties.
 	 */
-	public function set_properties() {}
+	public function set_properties(): void {}
 
 	/**
 	 * Register action hooks.
 	 */
-	public function action_hooks() {}
+	public function action_hooks(): void {}
 
 	/**
 	 * Register filter hooks.
 	 */
-	public function filter_hooks() {}
+	public function filter_hooks(): void {}
 }

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Traits/PageBlocks.php

@@ -6,9 +6,9 @@ trait PageBlocks {
 	/**
 	 * Content blocks from current page
 	 *
-	 * @var array|null
+	 * @var ?array
 	 */
-	private static $content_blocks_names = null;
+	private static ?array $content_blocks_names = null;
 
 	/**
 	 * Get the instance of the class.
@@ -17,8 +17,8 @@ trait PageBlocks {
 	 *
 	 * @return array
 	 */
-	public function get_content_blocks_names( $prefix = 'chisel' ) {
-		if ( self::$content_blocks_names ) {
+	public function get_content_blocks_names( string $prefix = 'chisel' ): array {
+		if ( self::$content_blocks_names !== null ) {
 			return self::$content_blocks_names;
 		}
 
@@ -26,24 +26,24 @@ trait PageBlocks {
 
 		$content_blocks_names = array();
 
-		if ( is_a( $post, 'WP_Post' ) && $post->post_content && has_blocks( $post->post_content ) ) {
+		if ( $post instanceof \WP_Post && ! empty( $post->post_content ) && has_blocks( $post->post_content ) ) {
 			$blocks = parse_blocks( $post->post_content );
 
-			if ( $blocks ) {
+			if ( is_array( $blocks ) && ! empty( $blocks ) ) {
 				$blocks_names = $this->get_blocks_names( $blocks );
 
-				if ( $blocks_names ) {
+				if ( ! empty( $blocks_names ) ) {
 					$blocks_names = array_filter(
 						$blocks_names,
-						function ( $block_name ) use ( $prefix ) {
-							return strpos( $block_name, $prefix ) !== false;
+						function ( string $block_name ) use ( $prefix ): bool {
+							return (bool) strpos( $block_name, $prefix ) !== false;
 						}
 					);
 
-					if ( $blocks_names ) {
+					if ( ! empty( $blocks_names ) ) {
 						$blocks_names         = array_values( array_unique( $blocks_names ) );
 						$blocks_names         = array_map(
-							function ( $block_name ) use ( $prefix ) {
+							function ( string $block_name ) use ( $prefix ): string {
 								return str_replace( $prefix . '/', '', $block_name );
 							},
 							$blocks_names
@@ -66,7 +66,7 @@ trait PageBlocks {
 	 *
 	 * @return array
 	 */
-	private function get_blocks_names( $inner_blocks ) {
+	private function get_blocks_names( array $inner_blocks ): array {
 		$blocks_names = array();
 
 		foreach ( $inner_blocks as $block ) {
@@ -78,10 +78,10 @@ trait PageBlocks {
 
 			$blocks_names[] = $block_name;
 
-			if ( isset( $block['innerBlocks'] ) && $block['innerBlocks'] ) {
+			if ( isset( $block['innerBlocks'] ) && ! empty( $block['innerBlocks'] ) ) {
 				$inner_blocks_names = $this->get_blocks_names( $block['innerBlocks'] );
 
-				if ( $inner_blocks_names ) {
+				if ( ! empty( $inner_blocks_names ) ) {
 					$blocks_names = array_merge( $blocks_names, $inner_blocks_names );
 				}
 			}

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Traits/Singleton.php

@@ -6,18 +6,39 @@ trait Singleton {
 	/**
 	 * Instance of the class.
 	 *
-	 * @var self
+	 * @var object
 	 */
-	private static $instance;
+	private static ?object $instance = null;
 
 	/**
-	 * Get the instance of the class.
+	 * Get the instance of the class using the singleton.
+	 *
+	 * @return object
 	 */
-	public static function get_instance() {
-		if ( ! ( self::$instance instanceof self ) ) {
-				self::$instance = new self();
+	public static function get_instance(): static {
+		if ( ! ( static::$instance instanceof static ) ) {
+			static::$instance = new static();
 		}
 
-		return self::$instance;
+		return static::$instance;
+	}
+
+	/**
+	 * Prevent direct construction; let get_instance() control instantiation.
+	 */
+	private function __construct() {}
+
+	/**
+	 * Prevent cloning.
+	 */
+	private function __clone() {}
+
+	/**
+	 * Prevent unserialization.
+	 *
+	 * @throws \LogicException - Cannot unserialize singleton.
+	 */
+	public function __wakeup(): void {
+		throw new \LogicException( 'Cannot unserialize singleton' );
 	}
 }

package/lib/commands/create/creators/app/chisel-starter-theme/inc/WP/Acf.php

@@ -5,14 +5,15 @@ namespace Chisel\WP;
 use Chisel\Interfaces\InstanceInterface;
 use Chisel\Interfaces\HooksInterface;
 use Chisel\Traits\Singleton;
-use Chisel\Factory\RegisterAcfOptionsPage;
+use Chisel\Factories\RegisterAcfOptionsPage;
+use Chisel\Enums\AcfOptionsPageType;
 
 /**
  * ACF related functionalities.
  *
  * @package Chisel
  */
-class Acf implements InstanceInterface, HooksInterface {
+final class Acf implements InstanceInterface, HooksInterface {
 
 	use Singleton;
 
@@ -21,14 +22,14 @@ class Acf implements InstanceInterface, HooksInterface {
 	 *
 	 * @var array
 	 */
-	private $acf_options_pages = array();
+	private array $acf_options_pages = array();
 
 	/**
 	 * ACF options sub pages.
 	 *
 	 * @var array
 	 */
-	private $acf_options_sub_pages = array();
+	private array $acf_options_sub_pages = array();
 
 	/**
 	 * Class constructor.
@@ -43,7 +44,7 @@ class Acf implements InstanceInterface, HooksInterface {
 	/**
 	 * Set properties.
 	 */
-	public function set_properties() {
+	public function set_properties(): void {
 		$this->set_options_pages();
 		$this->set_options_sub_pages();
 	}
@@ -51,20 +52,20 @@ class Acf implements InstanceInterface, HooksInterface {
 	/**
 	 * Register action hooks.
 	 */
-	public function action_hooks() {
+	public function action_hooks(): void {
 		add_action( 'acf/init', array( $this, 'options_pages' ) );
 	}
 
 	/**
 	 * Register filter hooks.
 	 */
-	public function filter_hooks() {
+	public function filter_hooks(): void {
 	}
 
 	/**
 	 * Set ACF options pages.
 	 */
-	private function set_options_pages() {
+	private function set_options_pages(): void {
 		$this->acf_options_pages = array(
 			// phpcs:disable
 			// array(
@@ -78,7 +79,7 @@ class Acf implements InstanceInterface, HooksInterface {
 	/**
 	 * Set ACF options sub pages.
 	 */
-	private function set_options_sub_pages() {
+	private function set_options_sub_pages(): void {
 		$this->acf_options_sub_pages = array(
 			// phpcs:disable
 			// array(
@@ -94,17 +95,17 @@ class Acf implements InstanceInterface, HooksInterface {
 	/**
 	 * Register ACF options pages.
 	 */
-	public function options_pages() {
+	public function options_pages(): void {
 		$this->acf_options_pages     = apply_filters( 'chisel_acf_options_pages', $this->acf_options_pages );
 		$this->acf_options_sub_pages = apply_filters( 'chisel_acf_options_sub_pages', $this->acf_options_sub_pages );
 
-		if ( $this->acf_options_pages && function_exists( 'acf_add_options_page' ) ) {
+		if ( is_array( $this->acf_options_pages ) && ! empty( $this->acf_options_pages ) && function_exists( 'acf_add_options_page' ) ) {
 			foreach ( $this->acf_options_pages as $data ) {
 				$this->register_options_page( $data, 'page' );
 			}
 		}
 
-		if ( $this->acf_options_sub_pages && function_exists( 'acf_add_options_sub_page' ) ) {
+		if ( is_array( $this->acf_options_sub_pages ) && ! empty( $this->acf_options_sub_pages ) && function_exists( 'acf_add_options_sub_page' ) ) {
 			foreach ( $this->acf_options_sub_pages as $data ) {
 				$this->register_options_page( $data, 'subpage' );
 			}
@@ -114,12 +115,12 @@ class Acf implements InstanceInterface, HooksInterface {
 	/**
 	 * Register ACF options pages.
 	 *
-	 * @param array  $data
-	 * @param string $type
+	 * @param array                     $data
+	 * @param AcfOptionsPageType|string $type
 	 *
 	 * @return void
 	 */
-	private function register_options_page( $data, $type = 'page' ) {
+	private function register_options_page( array $data, AcfOptionsPageType|string $type = AcfOptionsPageType::Page ): void {
 		( new RegisterAcfOptionsPage( $data, $type ) )->register();
 	}
 }

package/lib/commands/create/creators/app/chisel-starter-theme/inc/WP/AcfBlocks.php

@@ -6,17 +6,17 @@ use Timber\Timber;
 use Chisel\Interfaces\InstanceInterface;
 use Chisel\Interfaces\HooksInterface;
 use Chisel\Traits\Singleton;
-use Chisel\Factory\RegisterBlocks;
+use Chisel\Factories\RegisterBlocks;
 use Chisel\Traits\PageBlocks;
-use Chisel\Helper\BlocksHelpers;
-use Chisel\Helper\AssetsHelpers;
+use Chisel\Helpers\BlocksHelpers;
+use Chisel\Helpers\AssetsHelpers;
 
 /**
  * ACF blocks related functionalities.
  *
  * @package Chisel
  */
-class AcfBlocks implements InstanceInterface, HooksInterface {
+final class AcfBlocks implements InstanceInterface, HooksInterface {
 
 	use Singleton;
 	use PageBlocks;
@@ -26,21 +26,21 @@ class AcfBlocks implements InstanceInterface, HooksInterface {
 	 *
 	 * @var RegisterBlocks
 	 */
-	private $register_blocks_factory;
+	private RegisterBlocks $register_blocks_factory;
 
 	/**
 	 * Blocks.
 	 *
 	 * @var array
 	 */
-	private $blocks = array();
+	private array $blocks = array();
 
 	/**
 	 * Blocks twig file base path.
 	 *
 	 * @var string
 	 */
-	public $blocks_twig_base_path;
+	public string $blocks_twig_base_path = '';
 
 	/**
 	 * Class constructor.
@@ -59,21 +59,21 @@ class AcfBlocks implements InstanceInterface, HooksInterface {
 	/**
 	 * Set properties.
 	 */
-	public function set_properties() {
+	public function set_properties(): void {
 		$this->blocks_twig_base_path = 'build/blocks-acf/';
 	}
 
 	/**
 	 * Register action hooks.
 	 */
-	public function action_hooks() {
+	public function action_hooks(): void {
 		add_action( 'acf/init', array( $this, 'register_blocks' ) );
 	}
 
 	/**
 	 * Register filter hooks.
 	 */
-	public function filter_hooks() {
+	public function filter_hooks(): void {
 		add_filter( 'timber/locations', array( $this, 'tiwg_files_locations' ) );
 		add_filter( 'acf/settings/load_json', array( $this, 'load_acf_field_group' ) );
 		add_filter( 'acf/settings/save_json', array( $this, 'save_acf_field_group' ) );
@@ -82,7 +82,7 @@ class AcfBlocks implements InstanceInterface, HooksInterface {
 	/**
 	 * Register ACF blocks and their assets.
 	 */
-	public function register_blocks() {
+	public function register_blocks(): void {
 		$this->register_blocks_factory->register_custom_blocks();
 	}
 
@@ -92,8 +92,8 @@ class AcfBlocks implements InstanceInterface, HooksInterface {
 	 * @param array $locations The locations.
 	 * @return array
 	 */
-	public function tiwg_files_locations( $locations ) {
-		if ( ! is_array( $this->blocks ) || ! $this->blocks ) {
+	public function tiwg_files_locations( array $locations ): array {
+		if ( ! is_array( $this->blocks ) || empty( $this->blocks ) ) {
 			return $locations;
 		}
 
@@ -110,8 +110,8 @@ class AcfBlocks implements InstanceInterface, HooksInterface {
 	 * @param array $paths The paths.
 	 * @return array
 	 */
-	public function load_acf_field_group( $paths ) {
-		if ( ! is_array( $this->blocks ) || ! $this->blocks ) {
+	public function load_acf_field_group( array $paths ): array {
+		if ( ! is_array( $this->blocks ) || empty( $this->blocks ) ) {
 			return $paths;
 		}
 
@@ -128,7 +128,7 @@ class AcfBlocks implements InstanceInterface, HooksInterface {
 	 * @param string $path The path.
 	 * @return string
 	 */
-	public function save_acf_field_group( $path ) {
+	public function save_acf_field_group( string $path ): string {
 
 		$action    = isset( $_REQUEST['action'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['action'] ) ) : ''; // phpcs:ignore
 		$post_type = isset( $_REQUEST['post_type'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['post_type'] ) ) : ''; // phpcs:ignore
@@ -137,7 +137,7 @@ class AcfBlocks implements InstanceInterface, HooksInterface {
 			$location = isset( $_REQUEST['acf_field_group']['location'] ) ? $_REQUEST['acf_field_group']['location'] : array(); // phpcs:ignore
 
 			foreach ( $location as $group ) {
-				foreach ( $group as $rules ) {
+				foreach ( (array) $group as $rules ) {
 					if ( sanitize_text_field( $rules['param'] ) === 'block' && sanitize_text_field( $rules['operator'] ) === '==' ) {
 						$block_name = explode( '/', sanitize_text_field( $rules['value'] ) )[1];
 
@@ -159,7 +159,7 @@ class AcfBlocks implements InstanceInterface, HooksInterface {
 	 *
 	 * @return void
 	 */
-	public function dequeue_blocks_styles() {
+	public function dequeue_blocks_styles(): void {
 		if ( is_admin() ) {
 			return;
 		}
@@ -167,7 +167,7 @@ class AcfBlocks implements InstanceInterface, HooksInterface {
 		$blocks_used_on_page = $this->get_content_blocks_names();
 		$blocks              = $this->blocks;
 
-		if ( $blocks ) {
+		if ( ! empty( $blocks ) ) {
 			$blocks_path = $this->register_blocks_factory->get_blocks_path();
 			$blocks_url  = $this->register_blocks_factory->get_blocks_url();
 

package/lib/commands/create/creators/app/chisel-starter-theme/inc/WP/{AjaxEnpoints.php → AjaxEndpoints.php}

@@ -3,32 +3,32 @@
 namespace Chisel\WP;
 
 use Timber\Timber;
-use Chisel\Helper\CacheHelpers;
+use Chisel\Helpers\CacheHelpers;
 
 /**
  * Custom Ajax enpoints callbacks
  *
  * @package Chisel
  */
-class AjaxEndpoints {
+final class AjaxEndpoints {
 
 	/**
 	 * Ajax call for load more feature.
 	 *
 	 * @param \WP_REST_Request $request WP_REST_Request.
 	 *
-	 * @return json
+	 * @return \WP_REST_Response
 	 */
-	public function load_more( $request ) {
+	public function load_more( \WP_REST_Request $request ): \WP_REST_Response {
 		if ( ! $request ) {
 			return $this->error( 'No request data' );
 		}
 
 		$data = $this->get_data( $request );
 
-		$post_type = sanitize_text_field( $data['post_type'] );
-		$per_page  = absint( $data['per_page'] );
-		$page      = absint( $data['page'] );
+		$post_type = isset( $data['post_type'] ) ? sanitize_text_field( $data['post_type'] ) : 'post';
+		$per_page  = isset( $data['per_page'] ) ? absint( $data['per_page'] ) : 10;
+		$page      = isset( $data['page'] ) ? absint( $data['page'] ) : 1;
 
 		$response = '';
 
@@ -46,7 +46,7 @@ class AjaxEndpoints {
 			array_unshift( $templates, 'woocommerce/content-product.twig' );
 		}
 
-		if ( $posts ) {
+		if ( ! empty( $posts ) ) {
 			foreach ( $posts as $post ) {
 				$response .= Timber::compile( $templates, array( 'post' => $post ), CacheHelpers::expiry() );
 			}
@@ -62,18 +62,18 @@ class AjaxEndpoints {
 	 *
 	 * @return array
 	 */
-	private function get_data( $request ) {
+	private function get_data( \WP_REST_Request $request ): array {
 		return $request->get_body_params();
 	}
 
 	/**
 	 * This function will return a success response.
 	 *
-	 * @param array $data
+	 * @param mixed $data
 	 *
 	 * @return \WP_REST_Response
 	 */
-	private function success( $data = array() ) {
+	private function success( mixed $data = array() ): \WP_REST_Response {
 		return new \WP_REST_Response(
 			array(
 				'error'   => 0,
@@ -91,13 +91,13 @@ class AjaxEndpoints {
 	 *
 	 * @return \WP_REST_Response
 	 */
-	private function error( $message ) {
+	private function error( string $message ): \WP_REST_Response {
 		return new \WP_REST_Response(
 			array(
 				'error'   => 1,
 				'message' => $message,
 			),
-			400
+			200
 		);
 	}
 }