generator-chisel 2.1.2 → 2.2.0

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 <!-- INSERT-NEW-ENTRIES-HERE -->
 
+## 2.2.0 (2025-10-22)
+
+- composer update, min req php 8.2, refactor to modern php ([d55aae0](https://github.com/xfiveco/generator-chisel/commit/d55aae0))
+
 ## <small>2.1.2 (2025-09-30)</small>
 
 - minor fixes and adjustments, disable xmlrpc ([0bf6f64](https://github.com/xfiveco/generator-chisel/commit/0bf6f64))

package/lib/commands/create/creators/app/chisel-starter-theme/404.php

@@ -5,7 +5,7 @@
  * @package Chisel
  */
 
-use Chisel\Helper\CacheHelpers;
+use Chisel\Helpers\CacheHelpers;
 use Timber\Timber;
 
 $context = Timber::context();

package/lib/commands/create/creators/app/chisel-starter-theme/archive.php

@@ -5,7 +5,7 @@
  * @package Chisel
  */
 
-use Chisel\Helper\CacheHelpers;
+use Chisel\Helpers\CacheHelpers;
 use Timber\Timber;
 
 $templates = array( 'archive.twig', 'index.twig' );

package/lib/commands/create/creators/app/chisel-starter-theme/author.php

@@ -5,7 +5,7 @@
  * @package Chisel
  */
 
-use Chisel\Helper\CacheHelpers;
+use Chisel\Helpers\CacheHelpers;
 use Timber\Timber;
 
 $context = Timber::context();

package/lib/commands/create/creators/app/chisel-starter-theme/composer.json

@@ -6,16 +6,17 @@
       "dealerdirect/phpcodesniffer-composer-installer": true
     },
     "platform": {
-      "php": "7.4"
+      "php": "8.2"
     }
   },
   "require-dev": {
-    "squizlabs/php_codesniffer": "^3.9",
-    "wp-coding-standards/wpcs": "^3.1",
-    "friendsoftwig/twigcs": "^6.1",
-    "vincentlanglet/twig-cs-fixer": "^0.6.1"
+    "squizlabs/php_codesniffer": "^3.13",
+    "wp-coding-standards/wpcs": "^3.2",
+    "friendsoftwig/twigcs": "^6.5",
+    "vincentlanglet/twig-cs-fixer": "^3.10"
   },
   "require": {
-    "timber/timber": "^2.1"
+    "php": "^8.2",
+    "timber/timber": "^2.3"
   }
 }

package/lib/commands/create/creators/app/chisel-starter-theme/footer.php

@@ -9,7 +9,7 @@
  * @package Chisel
  */
 
-use Chisel\Helper\CacheHelpers;
+use Chisel\Helpers\CacheHelpers;
 
 $context = $GLOBALS['timberContext'];
 

package/lib/commands/create/creators/app/chisel-starter-theme/functions.php

@@ -39,6 +39,6 @@ Timber\Timber::init();
 \Chisel\WP\CustomPostTypes::get_instance();
 \Chisel\WP\CustomTaxonomies::get_instance();
 \Chisel\WP\Twig::get_instance();
-\Chisel\Plugin\GravityForms::get_instance();
-\Chisel\Plugin\Woocommerce::get_instance();
-\Chisel\Plugin\Yoast::get_instance();
+\Chisel\Plugins\GravityForms::get_instance();
+\Chisel\Plugins\Woocommerce::get_instance();
+\Chisel\Plugins\Yoast::get_instance();

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Controllers/AjaxController.php

@@ -12,7 +12,7 @@ use Chisel\Traits\Singleton;
  *
  * @package Chisel
  */
-class AjaxController extends \WP_REST_Controller implements InstanceInterface, HooksInterface {
+final class AjaxController extends \WP_REST_Controller implements InstanceInterface, HooksInterface {
 
 	use Singleton;
 
@@ -21,21 +21,21 @@ class AjaxController extends \WP_REST_Controller implements InstanceInterface, H
 	 *
 	 * @var string
 	 */
-	const ROUTE_NAMESPACE = 'chisel/v2';
+	public const ROUTE_NAMESPACE = 'chisel/v2';
 
 	/**
 	 * Ajax custom route base.
 	 *
 	 * @var string
 	 */
-	const ROUTE_BASE = 'ajax';
+	public const ROUTE_BASE = 'ajax';
 
 	/**
 	 * Ajax custom routes.
 	 *
 	 * @var array
 	 */
-	private $routes = array();
+	private array $routes = array();
 
 	/**
 	 * Class constructor.
@@ -50,7 +50,7 @@ class AjaxController extends \WP_REST_Controller implements InstanceInterface, H
 	/**
 	 * Set properties.
 	 */
-	public function set_properties() {
+	public function set_properties(): void {
 		$this->routes = array(
 			'load-more' => array(),
 		);
@@ -59,26 +59,26 @@ class AjaxController extends \WP_REST_Controller implements InstanceInterface, H
 	/**
 	 * Register action hooks.
 	 */
-	public function action_hooks() {
+	public function action_hooks(): void {
 		add_action( 'rest_api_init', array( $this, 'register_endpoints' ) );
 	}
 
 	/**
 	 * Register filter hooks.
 	 */
-	public function filter_hooks() {}
+	public function filter_hooks(): void {}
 
 	/**
 	 * Register endpoints
 	 *
 	 * @return void
 	 */
-	public function register_endpoints() {
+	public function register_endpoints(): void {
 		$this->routes = apply_filters( 'chisel_ajax_routes', $this->routes );
 
 		if ( $this->routes ) {
 			foreach ( $this->routes as $route_name => $route_params ) {
-				$route   = sprintf( self::ROUTE_BASE . '/%s/', $route_name );
+				$route   = sprintf( '%s/%s/', self::ROUTE_BASE, $route_name );
 				$methods = isset( $route_params['methods'] ) ? $route_params['methods'] : array( 'POST' );
 
 				register_rest_route(
@@ -100,9 +100,9 @@ class AjaxController extends \WP_REST_Controller implements InstanceInterface, H
 	 *
 	 * @param \WP_REST_Request $request WP_REST_Request.
 	 *
-	 * @return callable
+	 * @return \WP_REST_Response|\WP_Error|array
 	 */
-	public function callback( $request ) {
+	public function callback( \WP_REST_Request $request ): \WP_REST_Response|\WP_Error|array {
 		$callback       = $this->get_callback_name( $request );
 		$ajax_endpoints = new AjaxEndpoints();
 
@@ -115,8 +115,12 @@ class AjaxController extends \WP_REST_Controller implements InstanceInterface, H
 				define( 'DOING_CHISEL_AJAX', true );
 			}
 
-			return call_user_func( array( $ajax_endpoints, $callback ), $request );
+			$callable = array( $ajax_endpoints, $callback );
+
+			return $callable( $request );
 		}
+
+		return new \WP_Error( 'chisel_ajax_callback_missing', sprintf( 'Callback %s not found', $callback ), array( 'status' => 404 ) );
 	}
 
 	/**
@@ -126,10 +130,11 @@ class AjaxController extends \WP_REST_Controller implements InstanceInterface, H
 	 *
 	 * @return boolean
 	 */
-	public function permissions_check( $request ) {
+	public function permissions_check( \WP_REST_Request $request ): bool|\WP_Error {
 		$verify_nonce = wp_verify_nonce( $request->get_header( 'x_wp_nonce' ), 'wp_rest' );
+		$allowed      = (bool) $verify_nonce;
 
-		$permission = apply_filters( 'chisel_ajax_permissions_check', (bool) $verify_nonce, $this->get_callback_name( $request ), $request );
+		$permission = apply_filters( 'chisel_ajax_permissions_check', $allowed, $this->get_callback_name( $request ), $request );
 
 		return $permission;
 	}
@@ -141,7 +146,7 @@ class AjaxController extends \WP_REST_Controller implements InstanceInterface, H
 	 *
 	 * @return string
 	 */
-	private function get_callback_name( $request ) {
+	private function get_callback_name( \WP_REST_Request $request ): string {
 		$route       = $request->get_route();
 		$route_parts = explode( '/', $route );
 		$callback    = str_replace( '-', '_', end( $route_parts ) );

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Enums/AcfOptionsPageType.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Chisel\Enums;
+
+enum AcfOptionsPageType: string {
+	case Page    = 'page';
+	case SubPage = 'subpage';
+}

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Enums/BlocksType.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Chisel\Enums;
+
+enum BlocksType: string {
+	case ACF = 'acf';
+	case WP  = 'wp';
+
+	/**
+	 * Get the folder name based on the blocks type.
+	 *
+	 * @return string
+	 */
+	public function folder_name(): string {
+		return $this === self::ACF ? 'blocks-acf' : 'blocks';
+	}
+}

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Factories/RegisterAcfOptionsPage.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace Chisel\Factories;
+
+use Chisel\Enums\AcfOptionsPageType;
+
+/**
+ * Custom post types wrapper class.
+ *
+ * @package Chisel
+ */
+final class RegisterAcfOptionsPage {
+
+	/**
+	 * Page arguments.
+	 *
+	 * @var array
+	 */
+	private array $args;
+
+	/**
+	 * Page type - inc/Enums/Acf.php/AcfOptionsPageType
+	 *
+	 * @var AcfOptionsPageType
+	 */
+	private AcfOptionsPageType $type;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param array                     $args  page arguments.
+	 * @param AcfOptionsPageType|string $type  page or subpage.
+	 */
+	public function __construct( array $args, AcfOptionsPageType|string $type = AcfOptionsPageType::Page ) {
+		$this->args = $args;
+		$this->type = $type instanceof AcfOptionsPageType ? $type : AcfOptionsPageType::from( $type );
+	}
+
+	/**
+	 * Register ACF options page.
+	 */
+	public function register(): void {
+		$page_title      = $this->args['page_title'] ?? 'Options';
+		$menu_title      = $this->args['menu_title'] ?? $page_title;
+		$menu_slug       = $this->args['menu_slug'] ?? 'options';
+		$capability      = $this->args['capability'] ?? 'edit_posts';
+		$position        = $this->args['position'] ?? 45;
+		$redirect        = $this->args['redirect'] ?? true;
+		$icon_url        = $this->args['icon_url'] ?? 'dashicons-screenoptions';
+		$post_id         = $this->args['post_id'] ?? 'options';
+		$autoload        = $this->args['autoload'] ?? false;
+		$update_button   = $this->args['update_button'] ?? __( 'Update', 'chisel' );
+		$updated_message = $this->args['updated_message'] ?? __( 'Options Updated', 'chisel' );
+		$parent_slug     = $this->args['parent_slug'] ?? '';
+
+		$options_page_args = array(
+			'page_title'      => $page_title,
+			'menu_title'      => $menu_title,
+			'menu_slug'       => $menu_slug,
+			'capability'      => $capability,
+			'position'        => $position,
+			'redirect'        => $redirect,
+			'icon_url'        => $icon_url,
+			'post_id'         => $post_id,
+			'autoload'        => $autoload,
+			'update_button'   => $update_button,
+			'updated_message' => $updated_message,
+		);
+
+		if ( $this->type === AcfOptionsPageType::SubPage ) {
+			$options_page_args['parent_slug'] = $parent_slug;
+
+			acf_add_options_sub_page( $options_page_args );
+		} else {
+			acf_add_options_page( $options_page_args );
+		}
+	}
+}

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

@@ -1,113 +1,115 @@
 <?php
 
-namespace Chisel\Factory;
+namespace Chisel\Factories;
 
 use Chisel\WP\Assets;
-use Chisel\Helper\ThemeHelpers;
+use Chisel\Helpers\ThemeHelpers;
+use Chisel\Enums\BlocksType;
 
 /**
  * Class to register custom blocks.
  *
  * @package Chisel
  */
-class RegisterBlocks {
+final class RegisterBlocks {
 
 	/**
 	 * Blocks type.
 	 *
-	 * @var string
+	 * @var BlocksType|string
 	 */
-	private $blocks_type;
+	private BlocksType|string $blocks_type;
 
 	/**
 	 * Blocks path.
 	 *
 	 * @var string
 	 */
-	private $blocks_folder;
+	private string $blocks_folder;
 
 	/**
 	 * Blocks src path.
 	 *
 	 * @var string
 	 */
-	private $blocks_path_src;
+	private string $blocks_path_src;
 
 	/**
 	 * Blocks path.
 	 *
 	 * @var string
 	 */
-	private $blocks_path;
+	private string $blocks_path;
 
 	/**
 	 * Blocks url.
 	 *
 	 * @var string
 	 */
-	private $blocks_url;
+	private string $blocks_url;
 
 	/**
 	 * Blocks.
 	 *
 	 * @var array
 	 */
-	private $blocks = array();
+	private array $blocks = array();
 
 	/**
 	 * Theme.
 	 *
-	 * @var mixed
+	 * @var \WP_Theme
 	 */
-	private $theme = null;
+	private ?\WP_Theme $theme = null;
 
 	/**
 	 * Build folder.
 	 *
 	 * @var string
 	 */
-	private $build_folder = 'build';
+	private string $build_folder = 'build';
 
 	/**
 	 * Src folder.
 	 *
 	 * @var string
 	 */
-	private $src_folder = 'src';
+	private string $src_folder = 'src';
 
 	/**
 	 * Register scripts. By default block styles are inlined and js is registered by wp. Setting this to true will use custom hndles to register and enqueue scripts and styles and styles will not be inlined.
 	 *
 	 * @var bool
 	 */
-	private $register_scripts;
+	private bool $register_scripts;
 
 	/**
 	 * Class constructor.
 	 *
-	 * @param string $blocks_type The blocks type : acf or wp.
+	 * @param BlocksType|string $blocks_type The blocks type : acf or wp.
 	 */
-	public function __construct( $blocks_type ) {
-		$this->blocks_type     = $blocks_type;
+	public function __construct( BlocksType|string $blocks_type ) {
+		$blocks_type           = $blocks_type instanceof BlocksType ? $blocks_type : BlocksType::from( $blocks_type );
+		$this->blocks_type     = $blocks_type->value;
 		$this->theme           = wp_get_theme();
-		$this->blocks_folder   = $this->blocks_type === 'acf' ? 'blocks-acf' : 'blocks';
+		$this->blocks_folder   = $blocks_type->folder_name();
 		$this->blocks_path     = get_template_directory() . '/' . $this->build_folder . '/' . $this->blocks_folder;
 		$this->blocks_path_src = get_template_directory() . '/' . $this->src_folder . '/' . $this->blocks_folder;
 		$this->blocks_url      = get_template_directory_uri() . '/' . $this->build_folder . '/' . $this->blocks_folder;
 		$this->blocks          = $this->get_blocks();
 
-		$this->register_scripts = apply_filters( 'chisel_blocks_register_scripts', true, $this->blocks_type );
+		$this->register_scripts = (bool) apply_filters( 'chisel_blocks_register_scripts', true, $this->blocks_type );
 	}
 
 	/**
 	 * Register custom blocks and their assets.
 	 */
-	public function register_custom_blocks() {
+	public function register_custom_blocks(): void {
 		if ( ! function_exists( 'register_block_type' ) ) {
 			return;
 		}
 
-		if ( ! is_array( $this->blocks ) || ! $this->blocks ) {
+		if ( ! is_array( $this->blocks ) || empty( $this->blocks ) ) {
 			return;
 		}
 
@@ -133,7 +135,13 @@ class RegisterBlocks {
 				$block_url = $this->blocks_url . '/' . $block . '/';
 
 				// Read json file to array.
-				$block_metadata = wp_json_file_decode( $block_json, array( 'associative' => true ) );
+				$decoded = wp_json_file_decode( $block_json, array( 'associative' => true ) );
+				if ( ! is_array( $decoded ) ) {
+					// Skip malformed block.json.
+					continue;
+				}
+
+				$block_metadata = $decoded;
 
 				foreach ( $block_scripts as $script ) {
 					if ( ! isset( $block_metadata[$script] ) ) {
@@ -194,14 +202,17 @@ class RegisterBlocks {
 			}
 
 			if ( $this->register_scripts ) {
+				// Server-side registration with customized asset handles.
 				register_block_type( $block_path, $block_metadata );
 			} else {
+				// Let WP infer assets from block.json.
 				register_block_type( $block_json );
 			}
 
 			// In case we need to do some custom logic. All variables from this method are available in the init file.
-			if ( file_exists( $block_path_src . 'init.php' ) ) {
-				include_once $block_path_src . 'init.php';
+			$init_php = $block_path_src . 'init.php';
+			if ( is_file( $init_php ) ) {
+				include_once $init_php;
 			}
 		}
 	}
@@ -211,7 +222,7 @@ class RegisterBlocks {
 	 *
 	 * @return array
 	 */
-	public function get_blocks() {
+	public function get_blocks(): array {
 		if ( $this->blocks ) {
 			return $this->blocks;
 		}
@@ -240,7 +251,7 @@ class RegisterBlocks {
 	 *
 	 * @return string
 	 */
-	public function get_blocks_url() {
+	public function get_blocks_url(): string {
 		return $this->blocks_url;
 	}
 
@@ -249,7 +260,7 @@ class RegisterBlocks {
 	 *
 	 * @return string
 	 */
-	public function get_blocks_path() {
+	public function get_blocks_path(): string {
 		return $this->blocks_path;
 	}
 
@@ -258,7 +269,7 @@ class RegisterBlocks {
 	 *
 	 * @return string
 	 */
-	public function get_blocks_path_src() {
+	public function get_blocks_path_src(): string {
 		return $this->blocks_path_src;
 	}
 
@@ -270,7 +281,7 @@ class RegisterBlocks {
 	 *
 	 * @return array
 	 */
-	private function get_block_script_asset( $block, $file_name ) {
+	private function get_block_script_asset( string $block, string $file_name ): array {
 		$block_path        = $this->blocks_path . '/' . $block . '/';
 		$assets_file_name  = preg_replace( '/\.[^.]+$/', '', $file_name ) . '.asset.php';
 		$script_asset_path = $block_path . $assets_file_name;