generator-chisel 2.3.2 → 2.4.0

package/lib/commands/create/creators/app/chisel-starter-theme/{inc → core}/Helpers/CommentsHelpers.php

@@ -8,6 +8,10 @@ namespace Chisel\Helpers;
  * @package Chisel
  */
 final class CommentsHelpers {
+	/**
+	 * Prevent instantiation.
+	 */
+	private function __construct() {}
 
 	/**
 	 * Display comments template - the comments and the form.

package/lib/commands/create/creators/app/chisel-starter-theme/{inc → core}/Helpers/DataHelpers.php

@@ -10,6 +10,10 @@ use Timber\Timber;
  * @package Chisel
  */
 final class DataHelpers {
+	/**
+	 * Prevent instantiation.
+	 */
+	private function __construct() {}
 
 	/**
 	 * Json decode data for storing in html attribute

package/lib/commands/create/creators/app/chisel-starter-theme/{inc → core}/Helpers/GravityFormsHelpers.php

@@ -8,6 +8,10 @@ namespace Chisel\Helpers;
  * @package Chisel
  */
 final class GravityFormsHelpers {
+	/**
+	 * Prevent instantiation.
+	 */
+	private function __construct() {}
 
 	/**
 	 * Check if Gravity Forms plugin is active.

package/lib/commands/create/creators/app/chisel-starter-theme/{inc → core}/Helpers/ImageHelpers.php

@@ -10,6 +10,10 @@ use Timber\Timber;
  * @package Chisel
  */
 final class ImageHelpers {
+	/**
+	 * Prevent instantiation.
+	 */
+	private function __construct() {}
 
 	/**
 	 * Responsive image data.

package/lib/commands/create/creators/app/chisel-starter-theme/{inc → core}/Helpers/ThemeHelpers.php

@@ -10,6 +10,10 @@ use Chisel\Helpers\ImageHelpers;
  * @package Chisel
  */
 final class ThemeHelpers {
+	/**
+	 * Prevent instantiation.
+	 */
+	private function __construct() {}
 	/**
 	 * Color palettes.
 	 *
@@ -65,7 +69,7 @@ final class ThemeHelpers {
 	 * @return bool
 	 */
 	public static function should_use_icons_module(): bool {
-		return defined( 'CHISEL_USE_ICONS_MODULE' ) && CHISEL_USE_ICONS_MODULE;
+		return defined( 'CHISEL_USE_ICONS_MODULE' ) && CHISEL_USE_ICONS_MODULE === true;
 	}
 
 	/**
@@ -77,12 +81,16 @@ final class ThemeHelpers {
 	 * @return string
 	 */
 	public static function bem( string $name = '', mixed ...$modifiers ): string {
-		if ( $name === '' || empty( $modifiers ) ) {
+		if ( $name === '' ) {
 			return '';
 		}
 
 		$classnames = array( $name );
 
+		if ( empty( $modifiers ) ) {
+			return $name;
+		}
+
 		foreach ( $modifiers as $key => $value ) {
 			if ( is_array( $value ) ) {
 				$values = array_map(

package/lib/commands/create/creators/app/chisel-starter-theme/{inc → core}/Helpers/WoocommerceHelpers.php

@@ -8,6 +8,10 @@ namespace Chisel\Helpers;
  * @package Chisel
  */
 final class WoocommerceHelpers {
+	/**
+	 * Prevent instantiation.
+	 */
+	private function __construct() {}
 
 	/**
 	 * Check if WooCommerce is active.

package/lib/commands/create/creators/app/chisel-starter-theme/{inc → core}/Helpers/YoastHelpers.php

@@ -8,6 +8,10 @@ namespace Chisel\Helpers;
  * @package Chisel
  */
 final class YoastHelpers {
+	/**
+	 * Prevent instantiation.
+	 */
+	private function __construct() {}
 
 	/**
 	 * Check if Yoast plugin is active.

package/lib/commands/create/creators/app/chisel-starter-theme/core/Interfaces/AjaxEndpointInterface.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Chisel\Interfaces;
+
+interface AjaxEndpointInterface {
+
+	/**
+	 * Handle ajax request.
+	 *
+	 * @param \WP_REST_Request $request WP_REST_Request.
+	 *
+	 * @return \WP_REST_Response
+	 */
+	public function handle( \WP_REST_Request $request ): \WP_REST_Response;
+}

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

@@ -1,10 +1,8 @@
 <?php
 
-namespace Chisel\Plugins;
+namespace Chisel\Plugins\GravityForms;
 
-use Chisel\Interfaces\InstanceInterface;
-use Chisel\Interfaces\HooksInterface;
-use Chisel\Traits\Singleton;
+use Chisel\Traits\HooksSingleton;
 use Chisel\Helpers\GravityFormsHelpers;
 
 /**
@@ -12,29 +10,21 @@ use Chisel\Helpers\GravityFormsHelpers;
  *
  * @package Chisel
  */
-final class GravityForms implements InstanceInterface, HooksInterface {
+final class GravityForms {
 
-	use Singleton;
+	use HooksSingleton;
 
 	/**
-	 * Class constructor.
+	 * Initialize.
 	 */
-	private function __construct() {
+	public function init() {
 		if ( ! GravityFormsHelpers::is_gf_active() ) {
-			return;
+			return false;
 		}
 
-		add_action( 'after_setup_theme', array( $this, 'set_properties' ), 7 );
-
-		$this->action_hooks();
-		$this->filter_hooks();
+		return true;
 	}
 
-	/**
-	 * Set properties.
-	 */
-	public function set_properties(): void {}
-
 	/**
 	 * Register action hooks.
 	 */
@@ -47,8 +37,8 @@ final class GravityForms implements InstanceInterface, HooksInterface {
 	 */
 	public function filter_hooks(): void {
 		add_filter( 'chisel_frontend_footer_styles', array( $this, 'register_custom_styles' ) );
-		add_filter( 'chisel_enqueue_frontend_footer_style', array( $this, 'enqueue_custom_styles' ), 10, 3 );
-		add_filter( 'gform_form_theme_slug', array( $this, 'default_form_styles' ), 99, 2 );
+		add_filter( 'chisel_enqueue_frontend_footer_style', array( $this, 'enqueue_custom_styles' ), 10, 2 );
+		add_filter( 'gform_form_theme_slug', array( $this, 'default_form_styles' ), 99 );
 		add_filter( 'gform_plugin_settings_fields', array( $this, 'plugin_settings_fields' ), 99 );
 	}
 
@@ -77,11 +67,10 @@ final class GravityForms implements InstanceInterface, HooksInterface {
 	 *
 	 * @param bool   $enqueue
 	 * @param string $handle
-	 * @param array  $args
 	 *
 	 * @return bool
 	 */
-	public function enqueue_custom_styles( bool $enqueue, string $handle, array $args ): bool {
+	public function enqueue_custom_styles( bool $enqueue, string $handle ): bool {
 		if ( $handle !== 'gravity-forms' ) {
 			return $enqueue;
 		}
@@ -99,11 +88,10 @@ final class GravityForms implements InstanceInterface, HooksInterface {
 	 * Set default form styles for all forms so that our custom styles can be used.
 	 *
 	 * @param string $slug
-	 * @param array  $form
 	 *
 	 * @return string
 	 */
-	public function default_form_styles( string $slug, array $form ): string {
+	public function default_form_styles( string $slug ): string {
 		if ( ! is_admin() ) {
 			$slug = 'gravity-theme';
 		}

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

@@ -1,10 +1,9 @@
 <?php
 
-namespace Chisel\Plugins;
+namespace Chisel\Plugins\Woocommerce;
+
+use Chisel\Traits\HooksSingleton;
 
-use Chisel\Interfaces\InstanceInterface;
-use Chisel\Interfaces\HooksInterface;
-use Chisel\Traits\Singleton;
 use Chisel\Helpers\WoocommerceHelpers;
 
 /**
@@ -12,9 +11,8 @@ use Chisel\Helpers\WoocommerceHelpers;
  *
  * @package Chisel
  */
-final class Woocommerce implements InstanceInterface, HooksInterface {
-
-	use Singleton;
+class Woocommerce {
+	use HooksSingleton;
 
 	/**
 	 * Woocommerce sidebars.
@@ -24,17 +22,14 @@ final class Woocommerce implements InstanceInterface, HooksInterface {
 	private $sidebars = array();
 
 	/**
-	 * Class constructor.
+	 * Initialize.
 	 */
-	private function __construct() {
+	public function init(): bool {
 		if ( ! WoocommerceHelpers::is_woocommerce_active() ) {
-			return;
+			return false;
 		}
 
-		add_action( 'after_setup_theme', array( $this, 'set_properties' ), 7 );
-
-		$this->action_hooks();
-		$this->filter_hooks();
+		return true;
 	}
 
 	/**
@@ -74,6 +69,7 @@ final class Woocommerce implements InstanceInterface, HooksInterface {
 		add_filter( 'chisel_sidebars', array( $this, 'register_sidebars' ) );
 		add_filter( 'woocommerce_enqueue_styles', array( $this, 'enqueue_styles' ) );
 		add_filter( 'chisel_frontend_styles', array( $this, 'register_custom_styles' ) );
+		add_filter( 'woocommerce_template_loader_files', array( $this, 'woocommerce_template_loader_files' ), 99 );
 	}
 
 	/**
@@ -215,4 +211,17 @@ final class Woocommerce implements InstanceInterface, HooksInterface {
 
 		return $styles;
 	}
+
+	/**
+	 * Add custom woocommerce template loader files. Lets us override default templates.
+	 *
+	 * @param array $files
+	 *
+	 * @return array
+	 */
+	public function woocommerce_template_loader_files( array $files ): array {
+		$files[] = 'custom/woocommerce.php';
+
+		return $files;
+	}
 }

package/lib/commands/create/creators/app/chisel-starter-theme/core/Plugins/Yoast/Yoast.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Chisel\Plugins\Yoast;
+
+use Chisel\Traits\HooksSingleton;
+use Chisel\Helpers\YoastHelpers;
+
+/**
+ * Yoast SEO plugin related functionalities.
+ *
+ * @package Chisel
+ */
+final class Yoast {
+
+	use HooksSingleton;
+
+	/**
+	 * Initialize.
+	 */
+	public function init(): bool {
+		if ( ! YoastHelpers::is_yoast_active() ) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Register action hooks.
+	 */
+	public function action_hooks(): void {}
+
+	/**
+	 * Register filter hooks.
+	 */
+	public function filter_hooks(): void {}
+}

package/lib/commands/create/creators/app/chisel-starter-theme/{inc/WP → core/Timber}/Cache.php

@@ -1,12 +1,10 @@
 <?php
 
-namespace Chisel\WP;
+namespace Chisel\Timber;
 
 use Timber\Loader;
 
-use Chisel\Interfaces\InstanceInterface;
-use Chisel\Interfaces\HooksInterface;
-use Chisel\Traits\Singleton;
+use Chisel\Traits\HooksSingleton;
 use Chisel\Helpers\ThemeHelpers;
 
 /**
@@ -14,9 +12,9 @@ use Chisel\Helpers\ThemeHelpers;
  *
  * @package Chisel
  */
-final class Cache implements InstanceInterface, HooksInterface {
+final class Cache {
 
-	use Singleton;
+	use HooksSingleton;
 
 	/**
 	 * Cache expiry time.
@@ -39,16 +37,6 @@ final class Cache implements InstanceInterface, HooksInterface {
 	 */
 	private bool $environment_cache = false;
 
-	/**
-	 * Class constructor.
-	 */
-	private function __construct() {
-		add_action( 'after_setup_theme', array( $this, 'set_properties' ), 7 );
-
-		$this->action_hooks();
-		$this->filter_hooks();
-	}
-
 	/**
 	 * Set properties.
 	 */
@@ -80,7 +68,7 @@ final class Cache implements InstanceInterface, HooksInterface {
 	 */
 	public function cache_mode( string $cache_mode ): string {
 		// Available cache modes: 'CACHE_NONE', 'CACHE_OBJECT' (WP Object Cache), 'CACHE_TRANSIENT', 'CACHE_SITE_TRANSIENT', 'CACHE_USE_DEFAULT'.
-		$cache_mode = Loader::CACHE_USE_DEFAULT;
+		$cache_mode = Loader::CACHE_NONE;
 
 		return $cache_mode;
 	}

package/lib/commands/create/creators/app/chisel-starter-theme/{inc/WP → core/Timber}/ChiselImage.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Chisel\WP;
+namespace Chisel\Timber;
 
 use Timber\Image as TimberImage;
 

package/lib/commands/create/creators/app/chisel-starter-theme/{inc/WP → core/Timber}/ChiselPost.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Chisel\WP;
+namespace Chisel\Timber;
 
 use Timber\Post as TimberPost;
 use Timber\Timber;

package/lib/commands/create/creators/app/chisel-starter-theme/{inc/WP → core/Timber}/ChiselProduct.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Chisel\WP;
+namespace Chisel\Timber;
 
 use Timber\Post as TimberPost;
 use Timber\Timber;

package/lib/commands/create/creators/app/chisel-starter-theme/{inc/WP → core/Timber}/ChiselProductCategory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Chisel\WP;
+namespace Chisel\Timber;
 
 use Timber\Term as TimberTerm;
 use Chisel\Helpers\ImageHelpers;

package/lib/commands/create/creators/app/chisel-starter-theme/{inc/WP → core/Timber}/ChiselTerm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Chisel\WP;
+namespace Chisel\Timber;
 
 use Timber\Term as TimberTerm;
 

package/lib/commands/create/creators/app/chisel-starter-theme/{inc/WP → core/Timber}/Components.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Chisel\WP;
+namespace Chisel\Timber;
 
 use Timber\Timber;
 use Chisel\Helpers\ImageHelpers;

package/lib/commands/create/creators/app/chisel-starter-theme/core/Traits/Hooks.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Chisel\Traits;
+
+trait Hooks {
+	/**
+	 * Register action hooks.
+	 */
+	abstract public function action_hooks(): void;
+
+	/**
+	 * Register filter hooks.
+	 */
+	abstract public function filter_hooks(): void;
+
+	/**
+	 * Boot hooks.
+	 */
+	public function boot(): void {
+		if ( method_exists( $this, 'init' ) ) {
+			if ( $this->init() === false ) {
+				return;
+			}
+		}
+
+		$this->action_hooks();
+		$this->filter_hooks();
+	}
+}

package/lib/commands/create/creators/app/chisel-starter-theme/core/Traits/HooksSingleton.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Chisel\Traits;
+
+use Chisel\Traits\Singleton;
+use Chisel\Traits\Hooks;
+
+trait HooksSingleton {
+	use Singleton;
+	use Hooks;
+
+	/**
+	 * Properties hook.
+	 *
+	 * @var array
+	 */
+	protected function properties_hook(): array {
+		return array(
+			'action'   => 'after_setup_theme',
+			'priority' => 7,
+			'args'     => 1,
+		);
+	}
+
+	/**
+	 * Should call parent constructor.
+	 *
+	 * @return bool
+	 */
+	protected function should_call_parent_construct(): bool {
+		return false;
+	}
+
+	/**
+	 * Class constructor - boot the class.
+	 */
+	protected function __construct() {
+		if ( $this->should_call_parent_construct() ) {
+			parent::__construct();
+		}
+
+		if ( method_exists( $this, 'set_properties' ) ) {
+			$properties_hook = $this->properties_hook();
+			add_action(
+				$properties_hook['action'],
+				array( $this, 'set_properties' ),
+				$properties_hook['priority'],
+				$properties_hook['args']
+			);
+		}
+
+		$this->boot();
+	}
+}

package/lib/commands/create/creators/app/chisel-starter-theme/core/Traits/Rest.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Chisel\Traits;
+
+trait Rest {
+	/**
+	 * Get data from request.
+	 *
+	 * @param \WP_REST_Request $request WP_REST_Request.
+	 *
+	 * @return array
+	 */
+	private function get_data( \WP_REST_Request $request ): array {
+		return $request->get_body_params();
+	}
+
+	/**
+	 * This function will return a success response.
+	 *
+	 * @param mixed $data
+	 *
+	 * @return \WP_REST_Response
+	 */
+	private function success( mixed $data = array() ): \WP_REST_Response {
+		return new \WP_REST_Response(
+			array(
+				'error'   => 0,
+				'message' => 'ok',
+				'data'    => $data,
+			),
+			200
+		);
+	}
+
+	/**
+	 * This function will return an error response.
+	 *
+	 * @param string $message
+	 *
+	 * @return \WP_REST_Response
+	 */
+	private function error( string $message ): \WP_REST_Response {
+		return new \WP_REST_Response(
+			array(
+				'error'   => 1,
+				'message' => $message,
+			),
+			200
+		);
+	}
+}

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

@@ -4,29 +4,31 @@ namespace Chisel\Traits;
 
 trait Singleton {
 	/**
-	 * Instance of the class.
+	 * Instances of classes using this trait, keyed by class name.
 	 *
-	 * @var object
+	 * @var array<string, static>
 	 */
-	private static ?object $instance = null;
+	private static array $instances = array();
 
 	/**
 	 * Get the instance of the class using the singleton.
 	 *
-	 * @return object
+	 * @return static
 	 */
 	public static function get_instance(): static {
-		if ( ! ( static::$instance instanceof static ) ) {
-			static::$instance = new static();
+		$class = static::class;
+
+		if ( ! isset( self::$instances[ $class ] ) ) {
+			self::$instances[ $class ] = new static();
 		}
 
-		return static::$instance;
+		return self::$instances[ $class ];
 	}
 
 	/**
 	 * Prevent direct construction; let get_instance() control instantiation.
 	 */
-	private function __construct() {}
+	protected function __construct() {}
 
 	/**
 	 * Prevent cloning.