generator-chisel 2.1.2 → 2.2.0

package/lib/commands/create/creators/app/chisel-starter-theme/inc/{Factory → Factories}/RegisterCustomPostType.php

@@ -1,34 +1,34 @@
 <?php
 
-namespace Chisel\Factory;
+namespace Chisel\Factories;
 
 /**
  * Custom post types wrapper class.
  *
  * @package Chisel
  */
-class RegisterCustomPostType {
+final class RegisterCustomPostType {
 
 	/**
 	 * Post type.
 	 *
-	 * @var array
+	 * @var string
 	 */
-	private $post_type;
+	private string $post_type;
 
 	/**
 	 * Arguments.
 	 *
 	 * @var array
 	 */
-	private $args;
+	private array $args;
 
 	/**
 	 * Default arguments.
 	 *
 	 * @var array
 	 */
-	private $defaults;
+	private array $defaults;
 
 	/**
 	 * Class constructor.
@@ -37,7 +37,7 @@ class RegisterCustomPostType {
 	 * @param array  $args Arguments.
 	 * @param array  $defaults Default arguments.
 	 */
-	public function __construct( $post_type, $args, $defaults = array() ) {
+	public function __construct( string $post_type, array $args, array $defaults = array() ) {
 		$this->post_type = $post_type;
 		$this->args      = $args;
 		$this->defaults  = $defaults;
@@ -46,42 +46,46 @@ class RegisterCustomPostType {
 	/**
 	 * Register custom post type.
 	 */
-	public function register_post_type() {
+	public function register_post_type(): void {
 		$post_type      = $this->post_type;
 		$post_type_args = $this->args;
 		$defaults       = $this->defaults;
 
-		$default_supports = isset( $defaults['supports'] ) ? apply_filters( 'chisel_default_post_type_supports_' . $post_type, $defaults['supports'] ) : array();
-		$default_rewrite  = isset( $defaults['rewrite_args'] ) ? apply_filters( 'chisel_default_post_type_rewrite_args_' . $post_type, $defaults['rewrite_args'] ) : array();
+		$default_supports = isset( $defaults['supports'] )
+			? (array) apply_filters( 'chisel_default_post_type_supports_' . $post_type, $defaults['supports'] )
+			: array();
+		$default_rewrite  = isset( $defaults['rewrite_args'] )
+			? (array) apply_filters( 'chisel_default_post_type_rewrite_args_' . $post_type, $defaults['rewrite_args'] )
+			: array();
 
 		$labels = $this->get_post_type_labels();
 
 		$default_rewrite['slug'] = $post_type;
 
-		$description         = isset( $post_type_args['description'] ) ? $post_type_args['description'] : '';
-		$public              = isset( $post_type_args['public'] ) ? $post_type_args['public'] : true;
-		$hierarchical        = isset( $post_type_args['hierarchical'] ) ? $post_type_args['hierarchical'] : false; // true for pages like post type.
-		$exclude_from_search = isset( $post_type_args['exclude_from_search'] ) ? $post_type_args['exclude_from_search'] : ! $public;
-		$publicly_queryable  = isset( $post_type_args['publicly_queryable'] ) ? $post_type_args['publicly_queryable'] : $public;
-		$show_ui             = isset( $post_type_args['show_ui'] ) ? $post_type_args['show_ui'] : $public;  // show in admin.
-		$show_in_menu        = isset( $post_type_args['show_in_menu'] ) ? $post_type_args['show_in_menu'] : $public; // if or where to show in admin menu - show_ui must be true. If a string of an existing top level menu ('tools.php' or 'edit.php?post_type=page', for example), the post type will be placed as a sub-menu of that.
-		$show_in_nav_menus   = isset( $post_type_args['show_in_nav_menus'] ) ? $post_type_args['show_in_nav_menus'] : $public;
-		$show_in_admin_bar   = isset( $post_type_args['show_in_admin_bar'] ) ? $post_type_args['show_in_admin_bar'] : $show_in_menu;
-		$show_in_rest        = isset( $post_type_args['show_in_rest'] ) ? $post_type_args['show_in_rest'] : true; // set to false to disable block editor. Supports array must also include 'editor'.
-		$menu_position       = isset( $post_type_args['menu_position'] ) ? $post_type_args['menu_position'] : null;
-		$menu_icon           = isset( $post_type_args['menu_icon'] ) ? $post_type_args['menu_icon'] : 'dashicons-admin-post';
-		$capability_type     = isset( $post_type_args['capability_type'] ) ? $post_type_args['capability_type'] : 'post';
-		$capabilities        = isset( $post_type_args['capabilities'] ) ? $post_type_args['capabilities'] : array();
-		$supports            = isset( $post_type_args['supports'] ) ? wp_parse_args( $post_type_args['supports'], $default_supports ) : $default_supports;
-		$has_archive         = isset( $post_type_args['has_archive'] ) ? $post_type_args['has_archive'] : true;
-		$rewrite             = isset( $post_type_args['rewrite'] ) ? wp_parse_args( $post_type_args['rewrite'], $default_rewrite ) : $default_rewrite;
-		$query_var           = isset( $post_type_args['query_var'] ) ? $post_type_args['query_var'] : $post_type;
-		$can_export          = isset( $post_type_args['can_export'] ) ? $post_type_args['can_export'] : true;
+		$description         = $post_type_args['description'] ?? '';
+		$public              = (bool) ( $post_type_args['public'] ?? true );
+		$hierarchical        = (bool) ( $post_type_args['hierarchical'] ?? false ); // true for pages like post type.
+		$exclude_from_search = (bool) ( $post_type_args['exclude_from_search'] ?? ! $public );
+		$publicly_queryable  = (bool) ( $post_type_args['publicly_queryable'] ?? $public );
+		$show_ui             = (bool) ( $post_type_args['show_ui'] ?? $public );  // show in admin.
+		$show_in_menu        = $post_type_args['show_in_menu'] ?? $public; // bool|string. If or where to show in admin menu - show_ui must be true. If a string of an existing top level menu ('tools.php' or 'edit.php?post_type=page', for example), the post type will be placed as a sub-menu of that.
+		$show_in_nav_menus   = (bool) ( $post_type_args['show_in_nav_menus'] ?? $public );
+		$show_in_admin_bar   = (bool) ( $post_type_args['show_in_admin_bar'] ?? $show_in_menu );
+		$show_in_rest        = (bool) ( $post_type_args['show_in_rest'] ?? true ); // set to false to disable block editor. Supports array must also include 'editor'.
+		$menu_position       = $post_type_args['menu_position'] ?? null; // int|null are valid.
+		$menu_icon           = (string) ( $post_type_args['menu_icon'] ?? 'dashicons-admin-post' );
+		$capability_type     = $post_type_args['capability_type'] ?? 'post';
+		$capabilities        = (array) ( $post_type_args['capabilities'] ?? array() );
+		$supports            = isset( $post_type_args['supports'] ) ? wp_parse_args( (array) $post_type_args['supports'], $default_supports ) : $default_supports;
+		$has_archive         = (bool) ( $post_type_args['has_archive'] ?? true );
+		$rewrite             = isset( $post_type_args['rewrite'] ) ? wp_parse_args( (array) $post_type_args['rewrite'], $default_rewrite ) : $default_rewrite;
+		$query_var           = $post_type_args['query_var'] ?? $post_type;
+		$can_export          = (bool) ( $post_type_args['can_export'] ?? true );
 
 		if ( in_array( 'thumbnail', $supports, true ) ) {
 			add_filter(
 				'chisel_post_thumbnails_post_types',
-				function ( $pts ) use ( $post_type ) {
+				function ( array $pts ) use ( $post_type ): array {
 					$pts[] = $post_type;
 					return $pts;
 				}
@@ -140,9 +144,17 @@ class RegisterCustomPostType {
 	 *
 	 * @return array
 	 */
-	private function get_post_type_labels() {
+	private function get_post_type_labels(): array {
 		$post_type_args = $this->args;
 
+		if ( empty( $post_type_args['plural'] ) ) {
+			$post_type_args['plural'] = __( 'Items', 'chisel' );
+		}
+
+		if ( empty( $post_type_args['singular'] ) ) {
+			$post_type_args['singular'] = __( 'Item', 'chisel' );
+		}
+
 		$labels = array(
 			'name'                     => $post_type_args['plural'],
 			'singular_name'            => $post_type_args['singular'],
@@ -204,7 +216,7 @@ class RegisterCustomPostType {
 			'item_link_description'    => sprintf( __( 'A link to a %s', 'chisel' ), $post_type_args['singular'] ),
 		);
 
-		$custom_labels = isset( $post_type_args['labels'] ) ? $post_type_args['labels'] : array();
+		$custom_labels = isset( $post_type_args['labels'] ) && is_array( $post_type_args['labels'] ) ? $post_type_args['labels'] : array();
 
 		return wp_parse_args( $custom_labels, $labels );
 	}

package/lib/commands/create/creators/app/chisel-starter-theme/inc/{Factory → Factories}/RegisterCustomTaxonomy.php

@@ -1,34 +1,34 @@
 <?php
 
-namespace Chisel\Factory;
+namespace Chisel\Factories;
 
 /**
  * Custom axonomies wrapper class.
  *
  * @package Chisel
  */
-class RegisterCustomTaxonomy {
+final class RegisterCustomTaxonomy {
 
 	/**
 	 * Taxonomy.
 	 *
-	 * @var array
+	 * @var string
 	 */
-	private $taxonomy;
+	private string $taxonomy;
 
 	/**
 	 * Arguments.
 	 *
 	 * @var array
 	 */
-	private $args;
+	private array $args;
 
 	/**
 	 * Default arguments.
 	 *
 	 * @var array
 	 */
-	private $defaults;
+	private array $defaults;
 
 	/**
 	 * Class constructor.
@@ -37,7 +37,7 @@ class RegisterCustomTaxonomy {
 	 * @param array  $args Arguments.
 	 * @param array  $defaults Default arguments.
 	 */
-	public function __construct( $taxonomy, $args, $defaults = array() ) {
+	public function __construct( string $taxonomy, array $args, array $defaults = array() ) {
 		$this->taxonomy = $taxonomy;
 		$this->args     = $args;
 		$this->defaults = $defaults;
@@ -46,33 +46,37 @@ class RegisterCustomTaxonomy {
 	/**
 	 * Register custom taxonomy.
 	 */
-	public function register_taxonomy() {
+	public function register_taxonomy(): void {
 		$taxonomy      = $this->taxonomy;
 		$taxonomy_args = $this->args;
 		$defaults      = $this->defaults;
 
-		$default_capabilities = isset( $defaults['capabilities'] ) ? apply_filters( 'chisel_default_taxonomy_capabilities_' . $taxonomy, $defaults['capabilities'] ) : array();
-		$default_rewrite      = isset( $defaults['rewrite_args'] ) ? apply_filters( 'chisel_default_taxonomy_rewrite_args_' . $taxonomy, $defaults['rewrite_args'] ) : array();
+		$default_capabilities = isset( $defaults['capabilities'] )
+			? (array) apply_filters( 'chisel_default_taxonomy_capabilities_' . $taxonomy, $defaults['capabilities'] )
+			: array();
+		$default_rewrite      = isset( $defaults['rewrite_args'] )
+			? (array) apply_filters( 'chisel_default_taxonomy_rewrite_args_' . $taxonomy, $defaults['rewrite_args'] )
+			: array();
 
 		$labels = $this->get_taxonomy_labels();
 
 		$default_rewrite['slug'] = $taxonomy;
 
-		$description        = isset( $taxonomy_args['description'] ) ? $taxonomy_args['description'] : '';
-		$public             = isset( $taxonomy_args['public'] ) ? $taxonomy_args['public'] : true;
-		$publicly_queryable = isset( $taxonomy_args['publicly_queryable'] ) ? $taxonomy_args['publicly_queryable'] : $public;
-		$hierarchical       = isset( $taxonomy_args['hierarchical'] ) ? $taxonomy_args['hierarchical'] : false; // true for a taxonomy like categories.
-		$show_ui            = isset( $taxonomy_args['show_ui'] ) ? $taxonomy_args['show_ui'] : $public; // show in admin.
-		$show_in_menu       = isset( $taxonomy_args['show_in_menu'] ) ? $taxonomy_args['show_in_menu'] : $show_ui; // Show in admin menu (as a submenu of post type).
-		$show_in_nav_menus  = isset( $taxonomy_args['show_in_nav_menus'] ) ? $taxonomy_args['show_in_nav_menus'] : $public;
-		$show_in_rest       = isset( $taxonomy_args['show_in_rest'] ) ? $taxonomy_args['show_in_rest'] : true; // set to false to hide in block editor.
-		$show_tagcloud      = isset( $taxonomy_args['show_tagcloud'] ) ? $taxonomy_args['show_tagcloud'] : $show_ui;
-		$show_in_quick_edit = isset( $taxonomy_args['show_in_quick_edit'] ) ? $taxonomy_args['show_in_quick_edit'] : $show_ui;
-		$show_admin_column  = isset( $taxonomy_args['show_admin_column'] ) ? $taxonomy_args['show_admin_column'] : $public;
-		$capabilities       = isset( $taxonomy_args['capabilities'] ) ? wp_parse_args( $taxonomy_args['capabilities'], $default_capabilities ) : $default_capabilities;
-		$rewrite            = isset( $taxonomy_args['rewrite'] ) ? wp_parse_args( $taxonomy_args['rewrite'], $default_rewrite ) : $default_rewrite;
-		$query_var          = isset( $taxonomy_args['query_var'] ) ? $taxonomy_args['query_var'] : $taxonomy;
-		$rest_base          = isset( $taxonomy_args['rest_base'] ) ? $taxonomy_args['rest_base'] : $taxonomy;
+		$description        = $taxonomy_args['description'] ?? '';
+		$public             = (bool) ( $taxonomy_args['public'] ?? true );
+		$publicly_queryable = (bool) ( $taxonomy_args['publicly_queryable'] ?? $public );
+		$hierarchical       = (bool) ( $taxonomy_args['hierarchical'] ?? false ); // true for a taxonomy like categories.
+		$show_ui            = (bool) ( $taxonomy_args['show_ui'] ?? $public ); // show in admin.
+		$show_in_menu       = $taxonomy_args['show_in_menu'] ?? $show_ui; // Show in admin menu (as a submenu of post type) - bool|string (submenu parent).
+		$show_in_nav_menus  = (bool) ( $taxonomy_args['show_in_nav_menus'] ?? $public );
+		$show_in_rest       = (bool) ( $taxonomy_args['show_in_rest'] ?? true ); // set to false to hide in block editor.
+		$show_tagcloud      = (bool) ( $taxonomy_args['show_tagcloud'] ?? $show_ui );
+		$show_in_quick_edit = (bool) ( $taxonomy_args['show_in_quick_edit'] ?? $show_ui );
+		$show_admin_column  = (bool) ( $taxonomy_args['show_admin_column'] ?? $public );
+		$capabilities       = isset( $taxonomy_args['capabilities'] ) ? wp_parse_args( (array) $taxonomy_args['capabilities'], $default_capabilities ) : $default_capabilities;
+		$rewrite            = isset( $taxonomy_args['rewrite'] ) ? wp_parse_args( (array) $taxonomy_args['rewrite'], $default_rewrite ) : $default_rewrite;
+		$query_var          = $taxonomy_args['query_var'] ?? $taxonomy;
+		$rest_base          = $taxonomy_args['rest_base'] ?? $taxonomy;
 
 		$args = array(
 			'labels'             => $labels,
@@ -109,7 +113,7 @@ class RegisterCustomTaxonomy {
 			}
 		}
 
-		register_taxonomy( $taxonomy, $taxonomy_args['post_types'], $args );
+		register_taxonomy( $taxonomy, (array) $taxonomy_args['post_types'], $args );
 	}
 
 	/**
@@ -117,9 +121,17 @@ class RegisterCustomTaxonomy {
 	 *
 	 * @return array
 	 */
-	private function get_taxonomy_labels() {
+	private function get_taxonomy_labels(): array {
 		$taxonomy_args = $this->args;
 
+		if ( empty( $taxonomy_args['plural'] ) ) {
+			$taxonomy_args['plural'] = __( 'Items', 'chisel' );
+		}
+
+		if ( empty( $taxonomy_args['singular'] ) ) {
+			$taxonomy_args['singular'] = __( 'Item', 'chisel' );
+		}
+
 		$labels = array(
 			'name'                       => $taxonomy_args['plural'],
 			'singular_name'              => $taxonomy_args['singular'],

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

@@ -1,42 +1,42 @@
 <?php
 
-namespace Chisel\Helper;
+namespace Chisel\Helpers;
 
 /**
  * Helper functions.
  *
  * @package Chisel
  */
-class AcfHelpers {
+final class AcfHelpers {
 
 	/**
 	 * Get the acf field value. Acf get_field() wrapper. If ACF plugin is not active, returns false.
 	 *
-	 * @param string   $selector
-	 * @param int|bool $post_id
-	 * @param bool     $format_value
-	 * @param bool     $escape_html
+	 * @param string $selector
+	 * @param mixed  $post_id
+	 * @param bool   $format_value
+	 * @param bool   $escape_html
 	 *
 	 * @return mixed
 	 */
-	public static function get_field( $selector, $post_id = false, $format_value = true, $escape_html = false ) {
+	public static function get_field( string $selector, mixed $post_id = false, bool $format_value = true, bool $escape_html = false ) {
 		if ( function_exists( 'get_field' ) ) {
 			return get_field( $selector, $post_id, $format_value, $escape_html );
 		}
 
-		return false;
+		return null;
 	}
 
 	/**
 	 * Update the acf field value. Acf update_field() wrapper. If ACF plugin is not active, returns false.
 	 *
-	 * @param string   $selector
-	 * @param mixed    $value
-	 * @param int|bool $post_id
+	 * @param string $selector
+	 * @param mixed  $value
+	 * @param mixed  $post_id
 	 *
 	 * @return int|bool
 	 */
-	public static function update_field( $selector, $value, $post_id = false ) {
+	public static function update_field( string $selector, mixed $value, mixed $post_id = false ) {
 		if ( function_exists( 'update_field' ) ) {
 			return update_field( $selector, $value, $post_id );
 		}

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Helpers/AjaxHelpers.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Chisel\Helpers;
+
+use Chisel\Controllers\AjaxController;
+
+/**
+ * Helper functions.
+ *
+ * @package Chisel
+ */
+final class AjaxHelpers {
+
+	/**
+	 * Get custom ajax endpint
+	 *
+	 * @return string
+	 */
+	public static function get_ajax_endpoint_url(): string {
+		return sprintf( '%s/wp-json/%s/%s', rtrim( get_bloginfo( 'url' ), '/' ), AjaxController::ROUTE_NAMESPACE, AjaxController::ROUTE_BASE );
+	}
+
+	/**
+	 * Decode json string from ajax request safely
+	 *
+	 * @param string $value
+	 *
+	 * @return array
+	 */
+	public static function ajax_json_decode( string $value ): array {
+		$raw     = stripslashes( $value );
+		$decoded = json_decode( $raw, true, 512, JSON_THROW_ON_ERROR );
+
+		return is_array( $decoded ) ? $decoded : array();
+	}
+}

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

@@ -1,13 +1,13 @@
 <?php
 
-namespace Chisel\Helper;
+namespace Chisel\Helpers;
 
 /**
  * Helper functions.
  *
  * @package Chisel
  */
-class AssetsHelpers {
+final class AssetsHelpers {
 
 	/**
 	 * Get the final handle for the asset.
@@ -16,7 +16,7 @@ class AssetsHelpers {
 	 *
 	 * @return string
 	 */
-	public static function get_final_handle( $handle ) {
+	public static function get_final_handle( string $handle ): string {
 		$handle = 'chisel-' . $handle;
 
 		if ( ThemeHelpers::is_fast_refresh() ) {

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

@@ -1,37 +1,37 @@
 <?php
 
-namespace Chisel\Helper;
+namespace Chisel\Helpers;
 
 use Timber\Timber;
 use Chisel\WP\AcfBlocks;
-use Chisel\Helper\CacheHelpers;
+use Chisel\Helpers\CacheHelpers;
 
 /**
  * Helper functions.
  *
  * @package Chisel
  */
-class BlocksHelpers {
+final class BlocksHelpers {
 
 	/**
 	 * Get block object classnames
 	 *
-	 * @param string $block_name
+	 * @param ?string $block_name
 	 *
 	 * @return string
 	 */
-	public static function get_block_object_classnames( $block_name ) {
-		if ( ! $block_name ) {
+	public static function get_block_object_classnames( ?string $block_name ): string {
+		if ( empty( $block_name ) ) {
 			return '';
 		}
 
-		$block_name_parts = explode( '/', $block_name );
+		$parts = explode( '/', $block_name );
 
-		if ( empty( $block_name_parts ) || ! isset( $block_name_parts[1] ) ) {
+		if ( count( $parts ) < 2 ) {
 			return '';
 		}
 
-		return 'c-block c-block--' . $block_name_parts[0] . ' c-block--' . $block_name_parts[1];
+		return 'c-block c-block--' . $parts[0] . ' c-block--' . $parts[1];
 	}
 
 	/**
@@ -42,11 +42,11 @@ class BlocksHelpers {
 	 *
 	 * @return void
 	 */
-	public static function render_twig_file( $block_name, $context ) {
-		$block_name = explode( '/', $block_name );
-		$block_name = end( $block_name );
+	public static function render_twig_file( string $block_name, array $context ): void {
+		$parts      = explode( '/', $block_name );
+		$block_name = end( $parts ) ?: $block_name;
 
-		$twig_file = self::get_instance()->blocks_twig_base_path . $block_name . '/render.twig';
+		$twig_file = Blocks::get_instance()->blocks_twig_base_path . $block_name . '/render.twig';
 		Timber::render( $twig_file, $context );
 	}
 
@@ -60,7 +60,11 @@ class BlocksHelpers {
 	 *
 	 * @return void
 	 */
-	public static function acf_block_render( $block, $content = '', $is_preview = false, $post_id = 0 ) {
+	public static function acf_block_render( array $block, string $content = '', bool $is_preview = false, int $post_id = 0 ): void {
+		if ( empty( $block['name'] ) ) {
+			return;
+		}
+
 		$context = Timber::context();
 
 		$block_slug = str_replace( 'chisel/', '', $block['name'] );
@@ -70,7 +74,7 @@ class BlocksHelpers {
 		$context['post_id']    = $post_id;
 		$context['slug']       = $slug;
 		$context['is_preview'] = $is_preview;
-		$context['fields']     = get_fields();
+		$context['fields']     = function_exists( 'get_fields' ) ? get_fields() : array();
 		$classes               = array_merge(
 			array( $slug ),
 			isset( $block['className'] ) ? array( $block['className'] ) : array(),
@@ -79,7 +83,7 @@ class BlocksHelpers {
 		);
 
 		$context['block']['class_names'] = $classes;
-		$context['block']['block_id']    = isset( $block['anchor'] ) ? $block['anchor'] : $block['id'];
+		$context['block']['block_id']    = $block['anchor'] ?? ( $block['id'] ?? '' );
 
 		// allow to use filters to manipulate the output.
 		$context = apply_filters( 'chisel_timber_acf_blocks_data', $context );
@@ -104,8 +108,8 @@ class BlocksHelpers {
 	 *
 	 * @return string
 	 */
-	public static function get_block_inline_css( $blocks_url, $block_name ) {
-		$css_url  = $blocks_url . '/' . $block_name . '/script.css';
+	public static function get_block_inline_css( string $blocks_url, string $block_name ): string {
+		$css_url  = rtrim( $blocks_url, '/' ) . '/' . $block_name . '/script.css';
 		$response = wp_remote_get( $css_url );
 		$css      = '';
 

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Helpers/CacheHelpers.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Chisel\Helpers;
+
+use Timber\Timber;
+use Timber\Loader;
+
+use Chisel\WP\Cache;
+
+/**
+ * Image Helper functions.
+ *
+ * @package Chisel
+ */
+final class CacheHelpers {
+
+	/**
+	 * Get the cache expiry time.
+	 *
+	 * @param ?int $custom_expiry The custom expiry time.
+	 *
+	 * @return ?int
+	 */
+	public static function expiry( ?int $custom_expiry = null ): int {
+		$cache = Cache::get_instance();
+
+		if ( ! $cache->cache_everything ) {
+			return 0;
+		}
+
+		return $custom_expiry ?? (int) $cache->cache_expiry;
+	}
+
+	/**
+	 * Clear twig environment cache.
+	 *
+	 * @return void
+	 */
+	public static function clear_environment_cache(): void {
+		$loader = new Loader();
+		$loader->clear_cache_twig();
+	}
+}

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

@@ -1,26 +1,28 @@
 <?php
 
-namespace Chisel\Helper;
+namespace Chisel\Helpers;
 
 /**
  * Helper functions.
  *
  * @package Chisel
  */
-class CommentsHelpers {
+final class CommentsHelpers {
 
 	/**
 	 * Display comments template - the comments and the form.
 	 *
-	 * @return void
+	 * @return string
 	 */
-	public static function comments_template() {
+	public static function comments_template(): string {
 		if ( ! post_type_supports( get_post_type(), 'comments' ) ) {
-			return;
+			return '';
 		}
 
 		if ( comments_open() ) {
-			return apply_filters( 'the_content', '<!-- wp:pattern {"slug":"chisel/comments"} /-->' );
+			return do_blocks( '<!-- wp:pattern {"slug":"chisel/comments"} /-->' );
 		}
+
+		return '';
 	}
 }

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

@@ -1,6 +1,6 @@
 <?php
 
-namespace Chisel\Helper;
+namespace Chisel\Helpers;
 
 use Timber\Timber;
 
@@ -9,7 +9,7 @@ use Timber\Timber;
  *
  * @package Chisel
  */
-class DataHelpers {
+final class DataHelpers {
 
 	/**
 	 * Json decode data for storing in html attribute
@@ -18,7 +18,7 @@ class DataHelpers {
 	 *
 	 * @return string
 	 */
-	public static function json_encode_for_data_attribute( $data ) {
+	public static function json_encode_for_data_attribute( array $data ): string {
 		return htmlspecialchars( wp_json_encode( $data ) );
 	}
 
@@ -29,7 +29,7 @@ class DataHelpers {
 	 *
 	 * @return array
 	 */
-	public static function object_to_array( $object_to_convert ) {
-			return json_decode( wp_json_encode( $object_to_convert ), true );
+	public static function object_to_array( object $object_to_convert ): array {
+		return json_decode( wp_json_encode( $object_to_convert ), true );
 	}
 }