feat: add WpUtils

Author: j7-dev

composer.json

@@ -24,9 +24,7 @@
   },
   "require": {
     "kucrut/vite-for-wp": "^0.8.0",
-    "yahnis-elsts/plugin-update-checker": "^5.3",
-    "j7-dev/tgm-plugin-activation-forked": "1.2.2",
-    "micropackage/singleton": "^1.1"
+    "j7-dev/wp-utils": "0.0.8"
   },
   "require-dev": {
     "squizlabs/php_codesniffer": "@stable",

inc/class/admin/class-cpt.php

@@ -7,21 +7,21 @@
 
 namespace J7\WpReactPlugin\Admin;
 
-use Micropackage\Singleton\Singleton;
 use J7\WpReactPlugin\Utils\Base;
 use J7\WpReactPlugin\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 = array();
 	/**
 	 * Rewrite
 	 *
@@ -31,16 +31,22 @@ final class CPT extends Singleton {
 
 	/**
 	 * Constructor
-	 *
-	 * @param array $args Arguments.
 	 */
-	public function __construct( $args ) {
-		$this->post_metas = $args['post_metas'];
-		$this->rewrite    = $args['rewrite'] ?? array();
+	public function __construct() {
+		$args                  = array(
+			'post_meta_array' => array( 'meta', 'settings' ),
+			'rewrite'         => array(
+				'template_path' => 'test.php',
+				'slug'          => 'test',
+				'var'           => Plugin::$snake . '_test',
+			),
+		);
+		$this->post_meta_array = $args['post_meta_array'];
+		$this->rewrite         = $args['rewrite'] ?? array();
 
 		\add_action( 'init', array( $this, 'init' ) );
 
-		if ( ! empty( $args['post_metas'] ) ) {
+		if ( ! empty( $args['post_meta_array'] ) ) {
 			\add_action( 'rest_api_init', array( $this, 'add_post_meta' ) );
 		}
 
@@ -140,10 +146,10 @@ 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,
+				Plugin::$snake . '_' . $meta_key,
 				array(
 					'type'         => 'string',
 					'show_in_rest' => true,
@@ -168,9 +174,9 @@ 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, array( Plugin::$kebab ) ) ) {
 			\add_meta_box(
-				Plugin::KEBAB . '-metabox',
+				Plugin::$kebab . '-metabox',
 				__( 'My App', 'wp_react_plugin' ),
 				array( $this, 'render_meta_box' ),
 				$post_type,
@@ -254,15 +260,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 +284,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,15 +7,14 @@
 
 namespace J7\WpReactPlugin;
 
-use Micropackage\Singleton\Singleton;
 use J7\WpReactPlugin\Utils\Base;
 use Kucrut\Vite;
 
 /**
  * Class Bootstrap
  */
-final class Bootstrap extends Singleton {
-
+final class Bootstrap {
+	use \J7\WpUtils\Traits\SingletonTrait;
 
 	/**
 	 * Constructor
@@ -64,7 +63,7 @@ public function enqueue_script(): void {
 			Plugin::$dir . '/js/dist',
 			'js/src/main.tsx',
 			array(
-				'handle'    => Plugin::KEBAB,
+				'handle'    => Plugin::$kebab,
 				'in-footer' => true,
 			)
 		);
@@ -73,29 +72,29 @@ public function enqueue_script(): void {
 		$permalink = \get_permalink( $post_id );
 
 		\wp_localize_script(
-			Plugin::KEBAB,
-			Plugin::SNAKE . '_data',
+			Plugin::$kebab,
+			Plugin::$snake . '_data',
 			array(
 				'env' => array(
 					'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() ) ),

inc/class/front-end/class-entry.php

@@ -7,12 +7,12 @@
 
 namespace J7\WpReactPlugin\FrontEnd;
 
-use Micropackage\Singleton\Singleton;
 use J7\WpReactPlugin\Utils\Base;
 /**
  * Class Entry
  */
-final class Entry extends Singleton {
+final class Entry {
+	use \J7\WpUtils\Traits\SingletonTrait;
 
 	/**
 	 * Constructor
@@ -30,4 +30,4 @@ public function render_app(): void {
 	}
 }
 
-Entry::get();
+Entry::instance();

inc/class/utils/class-base.php

@@ -16,30 +16,4 @@ abstract class Base {
 	const APP2_SELECTOR = '#my_app_metabox';
 	const API_TIMEOUT   = '30000';
 	const DEFAULT_IMAGE = 'http://1.gravatar.com/avatar/1c39955b5fe5ae1bf51a77642f052848?s=96&d=mm&r=g';
-
-	/**
-	 * Is HPOS enabled
-	 *
-	 * @return bool
-	 */
-	public static function is_hpos_enabled(): bool {
-		return class_exists( \Automattic\WooCommerce\Utilities\OrderUtil::class ) && \Automattic\WooCommerce\Utilities\OrderUtil::custom_orders_table_usage_is_enabled();
-	}
-
-	/**
-	 * Delete post meta by meta id
-	 *
-	 * @param int $mid - meta id
-	 * @return string
-	 */
-	public static function delete_post_meta_by_mid( $mid ) {
-		global $wpdb;
-
-		// 执行删除查询
-		$deleted = $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}postmeta WHERE meta_id = %d", $mid ) );
-
-		$delete_success = $deleted !== false;
-
-		return $delete_success;
-	}
 }