From 13fc3f678303d4703207747b1b5c2ae91d422f99 Mon Sep 17 00:00:00 2001
From: sarahcssiqueira <sarahcso@hotmail.com>
Date: Sun, 23 Jun 2024 17:33:33 -0300
Subject: [PATCH 1/2] Updates IDE settings to work with a new phpcs/phcbf
 extension

---
 .vscode/settings.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index c0f424b..800310f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,6 @@
 {
-    "phpCodeSniffer.standard":	"Automatic",
-    "phpCodeSniffer.exec.osx":"./vendor/bin/phpcs"
-}
\ No newline at end of file
+    "phpsab.fixerEnable":true,
+    "phpsab.snifferEnable": true, 
+}
+
+

From 489659b8ab5428047f4267f5ce48541628f10c7d Mon Sep 17 00:00:00 2001
From: sarahcssiqueira <sarahcso@hotmail.com>
Date: Sun, 23 Jun 2024 20:26:40 -0300
Subject: [PATCH 2/2] Refactor Init class methods and blocks classes, removing
 duplicated code

---
 inc/BlockW.php      | 47 -----------------------
 inc/BlockX.php      | 47 -----------------------
 inc/BlockY.php      | 47 -----------------------
 inc/BlockZ.php      | 47 -----------------------
 inc/Blocks.php      | 38 +++++++++++++++++++
 inc/Init.php        | 47 +++++++++++++++--------
 inc/SingleBlock.php | 92 +++++++++++++++++++++++++++++++++++++++++++++
 wxyz-blocks.php     | 24 ++++++------
 8 files changed, 173 insertions(+), 216 deletions(-)
 delete mode 100644 inc/BlockW.php
 delete mode 100644 inc/BlockX.php
 delete mode 100644 inc/BlockY.php
 delete mode 100644 inc/BlockZ.php
 create mode 100644 inc/Blocks.php
 create mode 100644 inc/SingleBlock.php

diff --git a/inc/BlockW.php b/inc/BlockW.php
deleted file mode 100644
index a20d322..0000000
--- a/inc/BlockW.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Block W
- *
- * @package wxyzblocks
- */
-
-namespace WXYZBlocks\Inc;
-
-/**
- * Block W
- */
-class BlockW {
-
-
-	/**
-	 * Constructor for handle WordPress Hooks
-	 */
-	public function __construct() {
-		add_action( 'init', [ $this, 'block_w_register' ] );
-		add_action( 'enqueue_block_editor_assets', [ $this, 'block_w_enqueues' ] );
-	}
-
-	/**
-	 * Register Block
-	 */
-	public function block_w_register() {
-		register_block_type( __DIR__ );
-	}
-
-	/**
-	 * Enqueues
-	 */
-	public function block_w_enqueues() {
-		wp_enqueue_script(
-			'block-w',
-			plugin_dir_url( __FILE__ ) . '../blocks/block-w/build/index.js',
-			[ 'wp-blocks', 'wp-i18n', 'wp-editor' ]
-		);
-
-		wp_enqueue_style(
-			'block-w',
-			plugin_dir_url( __FILE__ ) . '..style/style.css',
-			[],
-		);
-	}
-}
diff --git a/inc/BlockX.php b/inc/BlockX.php
deleted file mode 100644
index 3a9f3bb..0000000
--- a/inc/BlockX.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Block X
- *
- * @package wxyzblocks
- */
-
-namespace WXYZBlocks\Inc;
-
-/**
- * Block X
- */
-class BlockX {
-
-
-	/**
-	 * Constructor for handle WordPress Hooks
-	 */
-	public function __construct() {
-		add_action( 'init', [ $this, 'block_x_register' ] );
-		add_action( 'enqueue_block_editor_assets', [ $this, 'block_x_enqueues' ] );
-	}
-
-	/**
-	 * Register Block
-	 */
-	public function block_x_register() {
-		register_block_type( __DIR__ );
-	}
-
-	/**
-	 * Enqueues
-	 */
-	public function block_x_enqueues() {
-		wp_enqueue_script(
-			'block-x',
-			plugin_dir_url( __FILE__ ) . '../blocks/block-x/build/index.js',
-			[ 'wp-blocks', 'wp-i18n', 'wp-editor' ]
-		);
-
-		wp_enqueue_style(
-			'block-x',
-			plugin_dir_url( __FILE__ ) . '..style/style.css',
-			[],
-		);
-	}
-}
diff --git a/inc/BlockY.php b/inc/BlockY.php
deleted file mode 100644
index 03951ae..0000000
--- a/inc/BlockY.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Block Y
- *
- * @package wxyzblocks
- */
-
-namespace WXYZBlocks\Inc;
-
-/**
- * Block Y
- */
-class BlockY {
-
-
-	/**
-	 * Constructor for handle WordPress Hooks
-	 */
-	public function __construct() {
-		add_action( 'init', [ $this, 'block_y_register' ] );
-		add_action( 'enqueue_block_editor_assets', [ $this, 'block_y_enqueues' ] );
-	}
-
-	/**
-	 * Register Block
-	 */
-	public function block_y_register() {
-		register_block_type( __DIR__ );
-	}
-
-	/**
-	 * Enqueues
-	 */
-	public function block_y_enqueues() {
-		wp_enqueue_script(
-			'block-y',
-			plugin_dir_url( __FILE__ ) . '../blocks/block-y/build/index.js',
-			[ 'wp-blocks', 'wp-i18n', 'wp-editor' ]
-		);
-
-		wp_enqueue_style(
-			'block-y',
-			plugin_dir_url( __FILE__ ) . '..style/style.css',
-			[],
-		);
-	}
-}
diff --git a/inc/BlockZ.php b/inc/BlockZ.php
deleted file mode 100644
index f7373e6..0000000
--- a/inc/BlockZ.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Block Z
- *
- * @package wxyzblocks
- */
-
-namespace WXYZBlocks\Inc;
-
-/**
- * Block Y
- */
-class BlockZ {
-
-
-	/**
-	 * Constructor for handle WordPress Hooks
-	 */
-	public function __construct() {
-		add_action( 'init', [ $this, 'block_z_register' ] );
-		add_action( 'enqueue_block_editor_assets', [ $this, 'block_z_enqueues' ] );
-	}
-
-	/**
-	 * Register Block
-	 */
-	public function block_z_register() {
-		register_block_type( __DIR__ );
-	}
-
-	/**
-	 * Enqueues
-	 */
-	public function block_z_enqueues() {
-		wp_enqueue_script(
-			'block-z',
-			plugin_dir_url( __FILE__ ) . '../blocks/block-z/build/index.js',
-			[ 'wp-blocks', 'wp-i18n', 'wp-editor' ]
-		);
-
-		wp_enqueue_style(
-			'block-z',
-			plugin_dir_url( __FILE__ ) . '..style/style.css',
-			[],
-		);
-	}
-}
diff --git a/inc/Blocks.php b/inc/Blocks.php
new file mode 100644
index 0000000..3b76904
--- /dev/null
+++ b/inc/Blocks.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Init
+ *
+ * @package wxyzblocks
+ */
+
+namespace WXYZBlocks\Inc;
+
+/**
+ * Class to be used by all blocks
+ */
+class Blocks {
+
+	/**
+	 * Custom constructor for handle WordPress Hooks
+	 */
+	public static function initialize() {
+		$self = new self();
+		add_filter( 'block_categories_all', [ $self, 'register_new_category' ] );
+	}
+
+	/**
+	 * Register new blocks category
+	 *
+	 * @param array $categories Existing block categories.
+	 * @return array Modified block categories
+	 */
+	public function register_new_category( $categories ) {
+		$categories[] = [
+			'slug'  => 'wxyz-blocks',
+			'title' => 'XYW...Z Blocks',
+		];
+
+		return $categories;
+	}
+
+}
diff --git a/inc/Init.php b/inc/Init.php
index 81dc66f..d2ea74f 100644
--- a/inc/Init.php
+++ b/inc/Init.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Init
+ * Init class
  *
  * @package wxyzblocks
  */
@@ -12,24 +12,39 @@
  */
 class Init {
 
-
 	/**
-	 * Constructor for handle WordPress Hooks
+	 * Store the classes inside an array
+	 *
+	 * @return array Full list of classes
 	 */
-	public function __construct() {
-		add_filter( 'block_categories_all', [ $this, 'register_new_category' ] );
-	}
-
-	/*
-	 Register custom category
-	*/
-	public function register_new_category( $categories ) {
-		$categories[] = [
-			'slug'  => 'wxyz-blocks',
-			'title' => 'XYW...Z Blocks',
+	public static function classes_list() {
+		return [
+			Blocks::class,
+			SingleBlock::class,
 		];
+	}
 
-		return $categories;
+	/**
+	 * Loop through the classes list, instatiate them,
+	 * and call the initialize() method if it exists
+	 */
+	public static function register_classes_list() {
+		foreach ( self::classes_list() as $class ) {
+			$classname = self::instantiate( $class );
+			if ( method_exists( $classname, 'initialize' ) ) {
+				$classname->initialize();
+			}
+		}
 	}
 
-}
+	/**
+	 * Initialize the classes
+	 *
+	 * @param  class $class    class from the services array.
+	 * @return class instance  new instance of the class
+	 */
+	private static function instantiate( $class ) {
+		$classname = new $class();
+		return $classname;
+	}
+};
diff --git a/inc/SingleBlock.php b/inc/SingleBlock.php
new file mode 100644
index 0000000..4c7d9fd
--- /dev/null
+++ b/inc/SingleBlock.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Block Z
+ *
+ * @package wxyzblocks
+ */
+
+namespace WXYZBlocks\Inc;
+
+/**
+ * Block Y
+ */
+class SingleBlock {
+
+	/**
+	 * Custom constructor for handle WordPress Hooks
+	 */
+	public static function initialize() {
+		$self = new self();
+		add_action( 'init', [ $self, 'blocks_list' ] );
+		add_action( 'init', [ $self, 'blocks_register' ] );
+		add_action( 'init', [ $self, 'blocks_enqueues' ] );
+		add_action( 'init', [ $self, 'custom_block_register' ] );
+		add_action( 'enqueue_block_editor_assets', [ $self, 'custom_block_enqueues' ] );
+	}
+
+	/**
+	 * Store the block names and paths at an array
+	 *
+	 * @return array Full list of block names and paths
+	 */
+	public static function blocks_list() {
+		return [
+			'block-w',
+			'block-x',
+			'block-y',
+			'block-z',
+		];
+	}
+
+	/**
+	 * Register all blocks.
+	 *
+	 * Iterates over the list of block names returned by the blocks_list method
+	 * and registers each block using the custom_block_register method.
+	 */
+	public function blocks_register() {
+		foreach ( self::blocks_list() as $block ) {
+			self::custom_block_register( $block );
+		}
+	}
+
+	/**
+	 * Enqueue all block assets.
+	 *
+	 * Iterates over the list of block names returned by the blocks_list method
+	 * and enqueues the scripts and styles for each block using the custom_block_enqueues method.
+	 */
+	public function blocks_enqueues() {
+		foreach ( self::blocks_list() as $block ) {
+			self::custom_block_enqueues( $block );
+		}
+	}
+
+	/**
+	 * Register Block
+	 *
+	 * @param  block $block block from the blocks_list method.
+	 */
+	public function custom_block_register( $block ) {
+		register_block_type( __DIR__ . "/../blocks/$block" );
+	}
+
+	/**
+	 * Enqueues
+	 *
+	 * @param  block $block block from the blocks_list method.
+	 */
+	public function custom_block_enqueues( $block ) {
+		wp_enqueue_script(
+			'$block',
+			plugin_dir_url( __FILE__ ) . '../blocks/' . $block . '/build/index.js',
+			[ 'wp-blocks', 'wp-i18n', 'wp-editor' ]
+		);
+
+		wp_enqueue_style(
+			'$block',
+			plugin_dir_url( __FILE__ ) . '..style/style.css',
+			[],
+		);
+	}
+}
diff --git a/wxyz-blocks.php b/wxyz-blocks.php
index 27d77fc..aa556cd 100644
--- a/wxyz-blocks.php
+++ b/wxyz-blocks.php
@@ -4,7 +4,7 @@
  * Plugin URI:        https://sarahjobs.com/wordpress/plugins/wxyz-blocks
  * Description:       Structure to work with multiple blocks in a single plugin.
  * Version:           1.0.0-beta
- * Requires at least: 5.6
+ * Requires at least: 5.8
  * Requires PHP:      7.4
  * Author:            Sarah Siqueira
  * Author URI:        https://sarahjobs.com/about
@@ -17,19 +17,19 @@
  * @package wxyzblocks
  */
 
+/**
+ * Exit is accessed directly.
+ */
 defined( 'ABSPATH' ) || exit;
 
+/**
+ * Composer Autoload
+ */
 require __DIR__ . '/vendor/autoload.php';
 
-use WXYZBlocks\Inc\BlockX;
-use WXYZBlocks\Inc\BlockY;
-use WXYZBlocks\Inc\BlockW;
-use WXYZBlocks\Inc\BlockZ;
+/**
+ * Bootstraps the plugin
+ */
 use WXYZBlocks\Inc\Init;
-
-new BlockX();
-new BlockY();
-new BlockW();
-new BlockZ();
-new Init();
-
+$init = new Init();
+$init->register_classes_list();