generator-chisel 2.3.3 → 2.4.0

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

@@ -3,9 +3,7 @@
 namespace Chisel\WP;
 
 use Timber\Timber;
-use Chisel\Interfaces\InstanceInterface;
-use Chisel\Interfaces\HooksInterface;
-use Chisel\Traits\Singleton;
+use Chisel\Traits\HooksSingleton;
 use Chisel\Factories\RegisterBlocks;
 use Chisel\Traits\PageBlocks;
 use Chisel\Helpers\BlocksHelpers;
@@ -16,9 +14,9 @@ use Chisel\Helpers\AssetsHelpers;
  *
  * @package Chisel
  */
-final class AcfBlocks implements InstanceInterface, HooksInterface {
+final class AcfBlocks {
 
-	use Singleton;
+	use HooksSingleton;
 	use PageBlocks;
 
 	/**
@@ -42,31 +40,20 @@ final class AcfBlocks implements InstanceInterface, HooksInterface {
 	 */
 	public string $blocks_twig_base_path = '';
 
-	/**
-	 * Class constructor.
-	 */
-	private function __construct() {
-		$this->register_blocks_factory = new RegisterBlocks( 'acf' );
-		$this->blocks                  = $this->register_blocks_factory->get_blocks();
-
-		add_action( 'after_setup_theme', array( $this, 'set_properties' ), 7 );
-		add_action( 'wp_print_styles', array( $this, 'dequeue_blocks_styles' ), 999 );
-
-		$this->action_hooks();
-		$this->filter_hooks();
-	}
-
 	/**
 	 * Set properties.
 	 */
 	public function set_properties(): void {
-		$this->blocks_twig_base_path = 'build/blocks-acf/';
+		$this->register_blocks_factory = new RegisterBlocks( 'acf' );
+		$this->blocks                  = $this->register_blocks_factory->get_blocks();
+		$this->blocks_twig_base_path   = 'build/blocks-acf/';
 	}
 
 	/**
 	 * Register action hooks.
 	 */
 	public function action_hooks(): void {
+		add_action( 'wp_print_styles', array( $this, 'dequeue_blocks_styles' ), 999 );
 		add_action( 'acf/init', array( $this, 'register_blocks' ) );
 	}
 

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

@@ -2,9 +2,7 @@
 
 namespace Chisel\WP;
 
-use Chisel\Interfaces\InstanceInterface;
-use Chisel\Interfaces\HooksInterface;
-use Chisel\Traits\Singleton;
+use Chisel\Traits\HooksSingleton;
 use Chisel\Helpers\ThemeHelpers;
 use Chisel\Helpers\AjaxHelpers;
 use Chisel\Helpers\AssetsHelpers;
@@ -14,9 +12,9 @@ use Chisel\Helpers\AssetsHelpers;
  *
  * @package Chisel
  */
-final class Assets implements InstanceInterface, HooksInterface {
+final class Assets {
 
-	use Singleton;
+	use HooksSingleton;
 
 	/**
 	 * Front-end styles to be registered and enqueued.
@@ -88,16 +86,6 @@ final class Assets implements InstanceInterface, HooksInterface {
 	 */
 	private string $refresh_runtime_dependency = 'wp-react-refresh-runtime';
 
-	/**
-	 * Class constructor.
-	 */
-	private function __construct() {
-		add_action( 'after_setup_theme', array( $this, 'set_properties' ), 7 );
-
-		$this->action_hooks();
-		$this->filter_hooks();
-	}
-
 	/**
 	 * Set properties.
 	 */

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

@@ -4,9 +4,7 @@ namespace Chisel\WP;
 
 use Timber\Timber;
 
-use Chisel\Interfaces\InstanceInterface;
-use Chisel\Interfaces\HooksInterface;
-use Chisel\Traits\Singleton;
+use Chisel\Traits\HooksSingleton;
 use Chisel\Factories\RegisterBlocks;
 use Chisel\Helpers\BlocksHelpers;
 use Chisel\Helpers\ThemeHelpers;
@@ -17,9 +15,9 @@ use Chisel\Traits\PageBlocks;
  *
  * @package Chisel
  */
-final class Blocks implements InstanceInterface, HooksInterface {
+final class Blocks {
 
-	use Singleton;
+	use HooksSingleton;
 	use PageBlocks;
 
 	/**
@@ -71,25 +69,15 @@ final class Blocks implements InstanceInterface, HooksInterface {
 	 *
 	 * @var string
 	 */
-	private string $blocks_twig_base_path = 'build/blocks/';
-
-	/**
-	 * Class constructor.
-	 */
-	private function __construct() {
-		$this->register_blocks_factory = new RegisterBlocks( 'wp' );
-		$this->blocks                  = $this->register_blocks_factory->get_blocks();
-
-		add_action( 'after_setup_theme', array( $this, 'set_properties' ), 7 );
-
-		$this->action_hooks();
-		$this->filter_hooks();
-	}
+	public string $blocks_twig_base_path = '';
 
 	/**
 	 * Set properties.
 	 */
 	public function set_properties(): void {
+		$this->register_blocks_factory             = new RegisterBlocks( 'wp' );
+		$this->blocks                              = $this->register_blocks_factory->get_blocks();
+		$this->blocks_twig_base_path               = 'build/blocks/';
 		$this->theme                               = wp_get_theme();
 		$this->blocks_category                     = 'chisel-blocks';
 		$this->block_patterns_categories_namespace = 'chisel-patterns';

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

@@ -2,18 +2,16 @@
 
 namespace Chisel\WP;
 
-use Chisel\Interfaces\InstanceInterface;
-use Chisel\Interfaces\HooksInterface;
-use Chisel\Traits\Singleton;
+use Chisel\Traits\HooksSingleton;
 
 /**
  * Comments related functionalities.
  *
  * @package Chisel
  */
-final class Comments implements InstanceInterface, HooksInterface {
+final class Comments {
 
-	use Singleton;
+	use HooksSingleton;
 
 	/**
 	 * Disable comments
@@ -32,69 +30,66 @@ final class Comments implements InstanceInterface, HooksInterface {
 		'page',
 	);
 
-	/**
-	 * Class constructor.
-	 */
-	private function __construct() {
-		$this->set_properties();
-
-		if ( $this->disable_comments ) {
-			$this->action_hooks();
-			$this->filter_hooks();
-		}
-	}
-
 	/**
 	 * Set properties.
 	 */
 	public function set_properties(): void {
-		$this->disable_comments = apply_filters( 'chisel_disable_comments', true );
+		$this->disable_comments = apply_filters( 'chisel_disable_comments', $this->disable_comments );
 	}
 
 	/**
 	 * Register action hooks.
 	 */
 	public function action_hooks(): void {
-			add_action( 'after_setup_theme', array( $this, 'disable_comments_for_post_types' ), 99 );
-			add_action( 'admin_menu', array( $this, 'remove_admin_menu' ), 999 );
+		if ( $this->disable_comments === false ) {
+			return;
+		}
+
+		add_action( 'after_setup_theme', array( $this, 'disable_comments_for_post_types' ), 99 );
+		add_action( 'admin_menu', array( $this, 'remove_admin_menu' ), 999 );
 
-			add_action( 'admin_print_styles-index.php', array( $this, 'admin_css' ) );
-			add_action( 'admin_print_styles-profile.php', array( $this, 'admin_css' ) );
-			add_action( 'wp_dashboard_setup', array( $this, 'filter_dashboard' ) );
+		add_action( 'admin_print_styles-index.php', array( $this, 'admin_css' ) );
+		add_action( 'admin_print_styles-profile.php', array( $this, 'admin_css' ) );
+		add_action( 'wp_dashboard_setup', array( $this, 'filter_dashboard' ) );
 
-			add_action( 'widgets_init', array( $this, 'disable_rc_widget' ) );
-			add_action( 'template_redirect', array( $this, 'filter_query' ), 9 ); // before redirect_canonical.
-			add_action( 'add_admin_bar_menus', array( $this, 'filter_admin_bar' ), 0 );
-			add_action( 'admin_init', array( $this, 'filter_admin_bar' ) );
+		add_action( 'widgets_init', array( $this, 'disable_rc_widget' ) );
+		add_action( 'template_redirect', array( $this, 'filter_query' ), 9 ); // before redirect_canonical.
+		add_action( 'add_admin_bar_menus', array( $this, 'filter_admin_bar' ), 0 );
+		add_action( 'admin_init', array( $this, 'filter_admin_bar' ) );
 
-			add_action( 'template_redirect', array( $this, 'check_comment_template' ) );
-			add_action( 'enqueue_block_editor_assets', array( $this, 'filter_gutenberg' ) );
+		add_action( 'template_redirect', array( $this, 'check_comment_template' ) );
+		add_action( 'enqueue_block_editor_assets', array( $this, 'filter_gutenberg' ) );
 	}
 
 	/**
 	 * Register filter hooks.
 	 */
 	public function filter_hooks(): void {
-			add_filter( 'wp_headers', array( $this, 'filter_wp_headers' ) );
-			add_filter( 'pre_option_default_pingback_flag', '__return_zero' );
-			add_filter( 'comments_open', '__return_false', 20 );
-			add_filter( 'pings_open', '__return_false', 20 );
-
-			// Remove comments links from feed.
-			add_filter( 'post_comments_feed_link', '__return_false' );
-			add_filter( 'comments_link_feed', '__return_false' );
-			add_filter( 'comment_link', '__return_false' );
-
-			// Remove comment count from feed.
-			add_filter( 'get_comments_number', '__return_false' );
-
-			// Remove feed link from header.
-			add_filter( 'feed_links_show_comments_feed', '__return_false' );
-
-			add_filter( 'rest_endpoints', array( $this, 'filter_rest_endpoints' ) );
-			add_filter( 'xmlrpc_methods', array( $this, 'disable_xmlrc_comments' ) );
-			add_filter( 'rest_pre_insert_comment', array( $this, 'disable_rest_api_comments' ), 10, 2 );
-			add_filter( 'comments_array', '__return_empty_array', 20 );
+
+		if ( $this->disable_comments === false ) {
+			return;
+		}
+
+		add_filter( 'wp_headers', array( $this, 'filter_wp_headers' ) );
+		add_filter( 'pre_option_default_pingback_flag', '__return_zero' );
+		add_filter( 'comments_open', '__return_false', 20 );
+		add_filter( 'pings_open', '__return_false', 20 );
+
+		// Remove comments links from feed.
+		add_filter( 'post_comments_feed_link', '__return_false' );
+		add_filter( 'comments_link_feed', '__return_false' );
+		add_filter( 'comment_link', '__return_false' );
+
+		// Remove comment count from feed.
+		add_filter( 'get_comments_number', '__return_false' );
+
+		// Remove feed link from header.
+		add_filter( 'feed_links_show_comments_feed', '__return_false' );
+
+		add_filter( 'rest_endpoints', array( $this, 'filter_rest_endpoints' ) );
+		add_filter( 'xmlrpc_methods', array( $this, 'disable_xmlrc_comments' ) );
+		add_filter( 'rest_pre_insert_comment', array( $this, 'disable_rest_api_comments' ), 10, 2 );
+		add_filter( 'comments_array', '__return_empty_array', 20 );
 	}
 
 	/**

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

@@ -2,9 +2,7 @@
 
 namespace Chisel\WP;
 
-use Chisel\Interfaces\InstanceInterface;
-use Chisel\Interfaces\HooksInterface;
-use Chisel\Traits\Singleton;
+use Chisel\Traits\HooksSingleton;
 use Chisel\Factories\RegisterCustomPostType;
 
 /**
@@ -12,9 +10,9 @@ use Chisel\Factories\RegisterCustomPostType;
  *
  * @package Chisel
  */
-final class CustomPostTypes implements InstanceInterface, HooksInterface {
+final class CustomPostTypes {
 
-	use Singleton;
+	use HooksSingleton;
 
 	/**
 	 * Post types.
@@ -37,16 +35,6 @@ final class CustomPostTypes implements InstanceInterface, HooksInterface {
 	 */
 	private array $default_post_type_rewrite_args = array();
 
-	/**
-	 * Class constructor.
-	 */
-	private function __construct() {
-		add_action( 'after_setup_theme', array( $this, 'set_properties' ), 7 );
-
-		$this->action_hooks();
-		$this->filter_hooks();
-	}
-
 	/**
 	 * Set properties.
 	 */
@@ -62,8 +50,6 @@ final class CustomPostTypes implements InstanceInterface, HooksInterface {
 				'ep_mask'    => EP_PERMALINK,
 			)
 		);
-
-		$this->set_post_types();
 	}
 
 	/**
@@ -100,24 +86,11 @@ final class CustomPostTypes implements InstanceInterface, HooksInterface {
 	}
 
 	/**
-	 * Set custom post types.
+	 * Get custom post types.
+	 *
+	 * @return array
 	 */
-	private function set_post_types(): void {
-		$this->post_types = array(
-			// phpcs:disable
-			// 'chisel-cpt' => array(
-			// 	'singular'      => __( 'Chisel CPT', 'chisel' ),
-			// 	'plural'        => __( 'Chisel CPTs', 'chisel' ),
-			// 	'supports'      => array( 'editor', 'thumbnail', 'excerpt' ),
-			// 	'menu_icon'     => 'dashicons-location-alt',
-			// 	'hierarchical'  => true,
-			// 	'public'        => true,
-			// 	'menu_position' => 20,
-			// 	'rewrite'       => array(
-			// 		'slug' => 'chisel-post',
-			// 	),
-			// ),
-			// phpcs:enable
-		);
+	public static function get_post_types(): array {
+		return self::get_instance()->post_types;
 	}
 }

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

@@ -2,9 +2,7 @@
 
 namespace Chisel\WP;
 
-use Chisel\Interfaces\InstanceInterface;
-use Chisel\Interfaces\HooksInterface;
-use Chisel\Traits\Singleton;
+use Chisel\Traits\HooksSingleton;
 use Chisel\Factories\RegisterCustomTaxonomy;
 
 /**
@@ -12,9 +10,9 @@ use Chisel\Factories\RegisterCustomTaxonomy;
  *
  * @package Chisel
  */
-final class CustomTaxonomies implements InstanceInterface, HooksInterface {
+final class CustomTaxonomies {
 
-	use Singleton;
+	use HooksSingleton;
 
 	/**
 	 * Taxonomies.
@@ -37,16 +35,6 @@ final class CustomTaxonomies implements InstanceInterface, HooksInterface {
 	 */
 	private array $default_taxonomy_capabilities = array();
 
-	/**
-	 * Class constructor.
-	 */
-	private function __construct() {
-		add_action( 'after_setup_theme', array( $this, 'set_properties' ), 7 );
-
-		$this->action_hooks();
-		$this->filter_hooks();
-	}
-
 	/**
 	 * Set properties.
 	 */
@@ -69,8 +57,6 @@ final class CustomTaxonomies implements InstanceInterface, HooksInterface {
 				'ep_mask'      => EP_NONE,
 			)
 		);
-
-		$this->set_taxonomies();
 	}
 
 	/**
@@ -85,6 +71,15 @@ final class CustomTaxonomies implements InstanceInterface, HooksInterface {
 	 */
 	public function filter_hooks(): void {}
 
+	/**
+	 * Get taxonomies.
+	 *
+	 * @return array
+	 */
+	public static function get_taxonomies(): array {
+		return self::get_instance()->taxonomies;
+	}
+
 	/**
 	 * Register custom taxonomies.
 	 */
@@ -106,23 +101,4 @@ final class CustomTaxonomies implements InstanceInterface, HooksInterface {
 			$register_custom_taxonomy_factory->register_taxonomy();
 		}
 	}
-
-	/**
-	 * Set custom taxonomies.
-	 */
-	private function set_taxonomies(): void {
-		$this->taxonomies = array(
-			// phpcs:disable
-			// 'chisel-term' => array(
-			// 	'singular'   => __( 'Chisel Term', 'chisel' ),
-			// 	'plural'     => __( 'Chisel Terms', 'chisel' ),
-			// 	'post_types' => array( 'chisel-cpt' ),
-			// 	'public'     => true,
-			// 	'rewrite'    => array(
-			// 		'slug' => 'chisel-term',
-			// 	),
-			// ),
-			// phpcs:enable
-		);
-	}
 }

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

@@ -2,18 +2,16 @@
 
 namespace Chisel\WP;
 
-use Chisel\Interfaces\InstanceInterface;
-use Chisel\Interfaces\HooksInterface;
-use Chisel\Traits\Singleton;
+use Chisel\Traits\HooksSingleton;
 
 /**
  * WordPress Sidebars setup related functionality.
  *
  * @package Chisel
  */
-class Sidebars implements InstanceInterface, HooksInterface {
+final class Sidebars {
 
-	use Singleton;
+	use HooksSingleton;
 
 	/**
 	 * Sidebars to register.
@@ -22,16 +20,6 @@ class Sidebars implements InstanceInterface, HooksInterface {
 	 */
 	private array $sidebars = array();
 
-	/**
-	 * Class constructor.
-	 */
-	private function __construct() {
-		add_action( 'after_setup_theme', array( $this, 'set_properties' ), 7 );
-
-		$this->action_hooks();
-		$this->filter_hooks();
-	}
-
 	/**
 	 * Set properties.
 	 */

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

@@ -5,36 +5,32 @@ namespace Chisel\WP;
 use Timber\Timber;
 use Timber\Site as TimberSite;
 
-use Chisel\Interfaces\InstanceInterface;
-use Chisel\Interfaces\HooksInterface;
-use Chisel\Traits\Singleton;
+use Chisel\Traits\HooksSingleton;
+use Chisel\Timber\ChiselImage;
+use Chisel\Timber\ChiselPost;
+use Chisel\Timber\ChiselProduct;
+use Chisel\Timber\ChiselProductCategory;
+use Chisel\Timber\ChiselTerm;
+use Chisel\Timber\Components;
 
 /**
  * Site related functionality related to timber.
  *
  * @package Chisel
  */
-final class Site extends TimberSite implements InstanceInterface, HooksInterface {
+final class Site extends TimberSite {
 
-	use Singleton;
+	use HooksSingleton;
 
 	/**
-	 * Class constructor.
+	 * Call parent constructor.
+	 *
+	 * @return bool
 	 */
-	private function __construct() {
-		add_action( 'after_setup_theme', array( $this, 'set_properties' ), 7 );
-
-		$this->action_hooks();
-		$this->filter_hooks();
-
-		parent::__construct();
+	protected function should_call_parent_construct(): bool {
+		return true;
 	}
 
-	/**
-	 * Set properties.
-	 */
-	public function set_properties(): void {}
-
 	/**
 	 * Register action hooks.
 	 */
@@ -44,11 +40,33 @@ final class Site extends TimberSite implements InstanceInterface, HooksInterface
 	 * Register filter hooks.
 	 */
 	public function filter_hooks(): void {
+		add_filter( 'timber/locations', array( $this, 'tiwg_files_locations' ) );
 		add_filter( 'timber/context', array( $this, 'add_to_context' ) );
 		add_filter( 'timber/post/classmap', array( $this, 'post_classmap' ) );
 		add_filter( 'timber/term/classmap', array( $this, 'term_classmap' ) );
 	}
 
+	/**
+	 * Add custom Timber files locations. Let views in custom directory override default views.
+	 *
+	 * @param array $locations The locations.
+	 *
+	 * @return array
+	 */
+	public function tiwg_files_locations( array $locations ): array {
+		$custom_templates = get_template_directory() . '/custom/views/';
+
+		if ( is_dir( $custom_templates ) ) {
+			if ( isset( $locations['__main__'] ) ) {
+				array_unshift( $locations['__main__'], $custom_templates );
+			} else {
+				array_unshift( $locations, $custom_templates );
+			}
+		}
+
+		return $locations;
+	}
+
 	/**
 	 * Add data to the context.
 	 *
@@ -80,6 +98,14 @@ final class Site extends TimberSite implements InstanceInterface, HooksInterface
 			'attachment' => ChiselImage::class,
 		);
 
+		$custom_post_types = CustomPostTypes::get_post_types();
+
+		foreach ( $custom_post_types as $cpt => $data ) {
+			if ( ! isset( $custom_classmap[$cpt] ) ) {
+				$custom_classmap[$cpt] = ChiselPost::class;
+			}
+		}
+
 		return array_merge( $classmap, $custom_classmap );
 	}
 
@@ -95,6 +121,14 @@ final class Site extends TimberSite implements InstanceInterface, HooksInterface
 			'product_cat' => ChiselProductCategory::class,
 		);
 
+		$custom_taxonomies = CustomTaxonomies::get_taxonomies();
+
+		foreach ( $custom_taxonomies as $taxonomy => $data ) {
+			if ( ! isset( $custom_classmap[$taxonomy] ) ) {
+				$custom_classmap[$taxonomy] = ChiselTerm::class;
+			}
+		}
+
 		return array_merge( $classmap, $custom_classmap );
 	}
 }

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

@@ -2,9 +2,7 @@
 
 namespace Chisel\WP;
 
-use Chisel\Interfaces\InstanceInterface;
-use Chisel\Interfaces\HooksInterface;
-use Chisel\Traits\Singleton;
+use Chisel\Traits\HooksSingleton;
 use Chisel\Helpers\ThemeHelpers;
 
 /**
@@ -12,9 +10,9 @@ use Chisel\Helpers\ThemeHelpers;
  *
  * @package Chisel
  */
-final class Theme implements InstanceInterface, HooksInterface {
+final class Theme {
 
-	use Singleton;
+	use HooksSingleton;
 
 	/**
 	 * Post types that support post thumbnails.
@@ -30,16 +28,6 @@ final class Theme implements InstanceInterface, HooksInterface {
 	 */
 	private array $nav_menus = array();
 
-	/**
-	 * Class constructor.
-	 */
-	private function __construct() {
-		add_action( 'after_setup_theme', array( $this, 'set_properties' ), 7 );
-
-		$this->action_hooks();
-		$this->filter_hooks();
-	}
-
 	/**
 	 * Set properties.
 	 */
@@ -83,6 +71,7 @@ final class Theme implements InstanceInterface, HooksInterface {
 	public function theme_supports(): void {
 		$this->post_thumbnails_post_types = (array) apply_filters( 'chisel_post_thumbnails_post_types', $this->post_thumbnails_post_types );
 
+		add_theme_support( 'title-tag' );
 		add_theme_support( 'post-formats', array() );
 		add_theme_support( 'post-thumbnails', $this->post_thumbnails_post_types );
 		add_theme_support( 'menus' );