feat: upgrade j7-dev/wp-utils and setting

Author: j7-dev

.eslintrc.json

@@ -27,6 +27,7 @@
 		"prettier"
 	],
 	"rules": {
+		"quote-props": "off",
 		"@typescript-eslint/no-explicit-any": "warn",
 		"@wordpress/no-unused-vars-before-return": "off",
 		"semi": [
@@ -52,7 +53,7 @@
 			"error",
 			{
 				"endOfLine": "auto",
-				"useTabs": false,
+				"useTabs": true,
 				"tabWidth": 2,
 				"prettier-multiline-arrays-set-threshold": 1
 			}
@@ -69,10 +70,6 @@
 			"error"
 		],
 		"camelcase": "off",
-		"quote-props": [
-			"error",
-			"consistent"
-		],
 		"jsdoc/valid-types": "off",
 		"@typescript-eslint/no-unused-vars": [
 			"warn",
@@ -85,9 +82,9 @@
 			"error",
 			{
 				"beforeBlockComment": true,
-				"afterBlockComment": true,
+				"afterBlockComment": false,
 				"beforeLineComment": true,
-				"afterLineComment": true,
+				"afterLineComment": false,
 				"allowBlockStart": true,
 				"allowBlockEnd": true,
 				"allowObjectStart": true,

.prettierrc

@@ -7,7 +7,7 @@
   "singleQuote": true,
   "tabWidth": 2,
   "trailingComma": "all",
-  "useTabs": false,
+  "useTabs": true,
   "endOfLine": "auto",
   "multilineArraysWrapThreshold": 4,
   "plugins": [
@@ -16,7 +16,9 @@
   ],
   "overrides": [
     {
-      "files": ["*.json"],
+      "files": [
+        "*.json"
+      ],
       "options": {
         "singleQuote": false
       }

composer.json

@@ -19,19 +19,23 @@
   ],
   "config": {
     "allow-plugins": {
-      "dealerdirect/phpcodesniffer-composer-installer": true
+      "dealerdirect/phpcodesniffer-composer-installer": true,
+      "phpstan/extension-installer": true
     }
   },
   "require": {
     "kucrut/vite-for-wp": "^0.8.0",
-    "yahnis-elsts/plugin-update-checker": "^5.3",
-    "j7-dev/tgm-plugin-activation-forked": "1.2.3",
-    "micropackage/singleton": "^1.1"
+    "j7-dev/wp-utils": "0.2.9"
   },
   "require-dev": {
     "squizlabs/php_codesniffer": "@stable",
     "wp-coding-standards/wpcs": "@stable",
-    "dealerdirect/phpcodesniffer-composer-installer": "@stable"
+    "dealerdirect/phpcodesniffer-composer-installer": "@stable",
+    "phpcompatibility/php-compatibility": "@stable",
+    "phpstan/phpstan": "^1.11",
+    "php-stubs/woocommerce-stubs": "^9.0",
+    "php-stubs/wordpress-stubs": "^6.5",
+    "phpstan/extension-installer": "^1.4"
   },
   "scripts": {
     "lint": "phpcs"

inc/class/admin/class-cpt.php

@@ -7,49 +7,58 @@
 
 namespace J7\WpRefinePlugin\Admin;
 
-use Micropackage\Singleton\Singleton;
 use J7\WpRefinePlugin\Utils\Base;
 use J7\WpRefinePlugin\Plugin;
 
 /**
  * Class CPT
  */
-final class CPT extends Singleton {
+final class CPT {
+	use \J7\WpUtils\Traits\SingletonTrait;
 
 	/**
 	 * Post metas
 	 *
 	 * @var array
 	 */
-	public $post_metas = array();
+	public $post_meta_array = [];
 	/**
 	 * Rewrite
 	 *
 	 * @var array
 	 */
-	public $rewrite = array();
+	public $rewrite = [];
 
 	/**
 	 * Constructor
 	 *
 	 * @param array $args Arguments.
 	 */
-	public function __construct( $args ) {
-		$this->post_metas = $args['post_metas'];
-		$this->rewrite    = $args['rewrite'] ?? array();
-
-		\add_action( 'init', array( $this, 'init' ) );
-
-		if ( ! empty( $args['post_metas'] ) ) {
-			\add_action( 'rest_api_init', array( $this, 'add_post_meta' ) );
+	public function __construct() {
+		$args = [
+			'post_meta_array' => [ 'meta', 'settings' ],
+			'rewrite'         => [
+				'template_path' => 'test.php',
+				'slug'          => 'test',
+				'var'           => Plugin::$snake . '_test',
+			],
+		];
+
+		$this->post_meta_array = $args['post_meta_array'];
+		$this->rewrite         = $args['rewrite'] ?? [];
+
+		\add_action( 'init', [ $this, 'init' ] );
+
+		if ( ! empty( $args['post_meta_array'] ) ) {
+			\add_action( 'rest_api_init', [ $this, 'add_post_meta' ] );
 		}
 
-		\add_action( 'load-post.php', array( $this, 'init_metabox' ) );
-		\add_action( 'load-post-new.php', array( $this, 'init_metabox' ) );
+		\add_action( 'load-post.php', [ $this, 'init_metabox' ] );
+		\add_action( 'load-post-new.php', [ $this, 'init_metabox' ] );
 
 		if ( ! empty( $args['rewrite'] ) ) {
-			\add_filter( 'query_vars', array( $this, 'add_query_var' ) );
-			\add_filter( 'template_include', array( $this, 'load_custom_template' ), 99 );
+			\add_filter( 'query_vars', [ $this, 'add_query_var' ] );
+			\add_filter( 'template_include', [ $this, 'load_custom_template' ], 99 );
 		}
 	}
 
@@ -71,7 +80,7 @@ public function init(): void {
 	 */
 	public static function register_cpt(): void {
 
-		$labels = array(
+		$labels = [
 			'name'                     => \esc_html__( 'my-refine-app', 'wp_refine_plugin' ),
 			'singular_name'            => \esc_html__( 'my-refine-app', 'wp_refine_plugin' ),
 			'add_new'                  => \esc_html__( 'Add new', 'wp_refine_plugin' ),
@@ -103,8 +112,8 @@ public static function register_cpt(): void {
 			'item_reverted_to_draft'   => \esc_html__( 'my-refine-app reverted to draft', 'wp_refine_plugin' ),
 			'item_scheduled'           => \esc_html__( 'my-refine-app scheduled', 'wp_refine_plugin' ),
 			'item_updated'             => \esc_html__( 'my-refine-app updated', 'wp_refine_plugin' ),
-		);
-		$args   = array(
+		];
+		$args   = [
 			'label'                 => \esc_html__( 'my-refine-app', 'wp_refine_plugin' ),
 			'labels'                => $labels,
 			'description'           => '',
@@ -125,13 +134,13 @@ public static function register_cpt(): void {
 			'menu_position'         => 6,
 			'menu_icon'             => 'dashicons-store',
 			'capability_type'       => 'post',
-			'supports'              => array( 'title', 'editor', 'thumbnail', 'custom-fields', 'author' ),
-			'taxonomies'            => array(),
+			'supports'              => [ 'title', 'editor', 'thumbnail', 'custom-fields', 'author' ],
+			'taxonomies'            => [],
 			'rest_controller_class' => 'WP_REST_Posts_Controller',
-			'rewrite'               => array(
+			'rewrite'               => [
 				'with_front' => true,
-			),
-		);
+			],
+		];
 
 		\register_post_type( 'my-refine-app', $args );
 	}
@@ -140,15 +149,15 @@ public static function register_cpt(): void {
 	 * Register meta fields for post type to show in rest api
 	 */
 	public function add_post_meta(): void {
-		foreach ( $this->post_metas as $meta_key ) {
+		foreach ( $this->post_meta_array as $meta_key ) {
 			\register_meta(
 				'post',
-				Plugin::SNAKE . '_' . $meta_key,
-				array(
+				Plugin::$snake . '_' . $meta_key,
+				[
 					'type'         => 'string',
 					'show_in_rest' => true,
 					'single'       => true,
-				)
+				]
 			);
 		}
 	}
@@ -157,9 +166,9 @@ public function add_post_meta(): void {
 	 * Meta box initialization.
 	 */
 	public function init_metabox(): void {
-		\add_action( 'add_meta_boxes', array( $this, 'add_metabox' ) );
-		\add_action( 'save_post', array( $this, 'save_metabox' ), 10, 2 );
-		\add_filter( 'rewrite_rules_array', array( $this, 'custom_post_type_rewrite_rules' ) );
+		\add_action( 'add_meta_boxes', [ $this, 'add_metabox' ] );
+		\add_action( 'save_post', [ $this, 'save_metabox' ], 10, 2 );
+		\add_filter( 'rewrite_rules_array', [ $this, 'custom_post_type_rewrite_rules' ] );
 	}
 
 	/**
@@ -168,11 +177,11 @@ public function init_metabox(): void {
 	 * @param string $post_type Post type.
 	 */
 	public function add_metabox( string $post_type ): void {
-		if ( in_array( $post_type, array( Plugin::KEBAB ) ) ) {
+		if ( in_array( $post_type, [ Plugin::$kebab ] ) ) {
 			\add_meta_box(
-				Plugin::KEBAB . '-metabox',
+				Plugin::$kebab . '-metabox',
 				__( 'My Refine App', 'wp_refine_plugin' ),
-				array( $this, 'render_meta_box' ),
+				[ $this, 'render_meta_box' ],
 				$post_type,
 				'advanced',
 				'high'
@@ -185,7 +194,7 @@ public function add_metabox( string $post_type ): void {
 	 */
 	public function render_meta_box(): void {
 		// phpcs:ignore
-		echo '<div id="' . Base::APP2_SELECTOR . '" class="relative"></div>';
+		echo '<div id="' . substr(Base::APP2_SELECTOR, 1) . '" class="relative"></div>';
 	}
 
 
@@ -254,15 +263,15 @@ public function save_metabox( $post_id, $post ) { // phpcs:ignore
 		/* OK, it's safe for us to save the data now. */
 
 		// Sanitize the user input.
-		$meta_data = \sanitize_text_field( $_POST[ Plugin::SNAKE . '_meta' ] );
+		$meta_data = \sanitize_text_field( $_POST[ Plugin::$snake . '_meta' ] );
 
 		// Update the meta field.
-		\update_post_meta( $post_id, Plugin::SNAKE . '_meta', $meta_data );
+		\update_post_meta( $post_id, Plugin::$snake . '_meta', $meta_data );
 	}
 
 	/**
 	 * Load custom template
-	 * Set {Plugin::KEBAB}/{slug}/report  php template
+	 * Set {Plugin::$kebab}/{slug}/report  php template
 	 *
 	 * @param string $template Template.
 	 */
@@ -278,13 +287,4 @@ public function load_custom_template( $template ) {
 	}
 }
 
-CPT::get(
-	array(
-		'post_metas' => array( 'meta', 'settings' ),
-		'rewrite'    => array(
-			'template_path' => 'test.php',
-			'slug'          => 'test',
-			'var'           => Plugin::SNAKE . '_test',
-		),
-	)
-);
+CPT::instance();

inc/class/class-bootstrap.php

@@ -7,14 +7,14 @@
 
 namespace J7\WpRefinePlugin;
 
-use Micropackage\Singleton\Singleton;
 use J7\WpRefinePlugin\Utils\Base;
 use Kucrut\Vite;
 
 /**
  * Class Bootstrap
  */
-final class Bootstrap extends Singleton {
+final class Bootstrap {
+	use \J7\WpUtils\Traits\SingletonTrait;
 
 
 	/**
@@ -25,8 +25,8 @@ public function __construct() {
 		require_once __DIR__ . '/admin/index.php';
 		require_once __DIR__ . '/front-end/index.php';
 
-		\add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_script' ), 99 );
-		\add_action( 'wp_enqueue_scripts', array( $this, 'frontend_enqueue_script' ), 99 );
+		\add_action( 'admin_enqueue_scripts', [ $this, 'admin_enqueue_script' ], 99 );
+		\add_action( 'wp_enqueue_scripts', [ $this, 'frontend_enqueue_script' ], 99 );
 	}
 
 	/**
@@ -63,44 +63,44 @@ public function enqueue_script(): void {
 		Vite\enqueue_asset(
 			Plugin::$dir . '/js/dist',
 			'js/src/main.tsx',
-			array(
-				'handle'    => Plugin::KEBAB,
+			[
+				'handle'    => Plugin::$kebab,
 				'in-footer' => true,
-			)
+			]
 		);
 
 		$post_id   = \get_the_ID();
 		$permalink = \get_permalink( $post_id );
 
 		\wp_localize_script(
-			Plugin::KEBAB,
-			Plugin::SNAKE . '_data',
-			array(
-				'env' => array(
+			Plugin::$kebab,
+			Plugin::$snake . '_data',
+			[
+				'env' => [
 					'siteUrl'       => \untrailingslashit( \site_url() ),
 					'ajaxUrl'       => \untrailingslashit( \admin_url( 'admin-ajax.php' ) ),
 					'userId'        => \wp_get_current_user()->data->ID ?? null,
 					'postId'        => $post_id,
 					'permalink'     => \untrailingslashit( $permalink ),
-					'APP_NAME'      => Plugin::APP_NAME,
-					'KEBAB'         => Plugin::KEBAB,
-					'SNAKE'         => Plugin::SNAKE,
+					'APP_NAME'      => Plugin::$app_name,
+					'KEBAB'         => Plugin::$kebab,
+					'SNAKE'         => Plugin::$snake,
 					'BASE_URL'      => Base::BASE_URL,
 					'APP1_SELECTOR' => Base::APP1_SELECTOR,
 					'APP2_SELECTOR' => Base::APP2_SELECTOR,
 					'API_TIMEOUT'   => Base::API_TIMEOUT,
-					'nonce'         => \wp_create_nonce( Plugin::KEBAB ),
-				),
-			)
+					'nonce'         => \wp_create_nonce( Plugin::$kebab ),
+				],
+			]
 		);
 
 		\wp_localize_script(
-			Plugin::KEBAB,
+			Plugin::$kebab,
 			'wpApiSettings',
-			array(
+			[
 				'root'  => \untrailingslashit( \esc_url_raw( rest_url() ) ),
 				'nonce' => \wp_create_nonce( 'wp_rest' ),
-			)
+			]
 		);
 	}
 }