fix: sync role caps via activation and migration

Author: Fellan-91

classes/class-blocks.php

@@ -28,20 +28,6 @@ class LazyBlocks_Blocks {
 	 */
 	private static $default_icon = null;
 
-	/**
-	 * Role capability sync option name.
-	 *
-	 * @var string
-	 */
-	const ROLE_CAPS_SYNC_OPTION = 'lzb_role_caps_version';
-
-	/**
-	 * Role capability sync version.
-	 *
-	 * @var string
-	 */
-	const ROLE_CAPS_SYNC_VERSION = '1';
-
 	/**
 	 * Cache hash for current request (includes controls and filter callbacks).
 	 *
@@ -357,26 +343,10 @@ public function sync_role_caps() {
 		}
 	}
 
-	/**
-	 * Synchronize Lazy Blocks capabilities once per sync version.
-	 *
-	 * @return bool
-	 */
-	public function maybe_sync_role_caps() {
-		if ( self::ROLE_CAPS_SYNC_VERSION === get_option( self::ROLE_CAPS_SYNC_OPTION ) ) {
-			return false;
-		}
-
-		$this->sync_role_caps();
-		update_option( self::ROLE_CAPS_SYNC_OPTION, self::ROLE_CAPS_SYNC_VERSION );
-
-		return true;
-	}
-
 	/**
 	 * Add Roles
 	 *
-	 * @deprecated Use maybe_sync_role_caps() or sync_role_caps().
+	 * @deprecated Use sync_role_caps().
 	 *
 	 * @return void
 	 */

classes/class-migration.php

@@ -35,10 +35,6 @@ public function __construct() {
 	 * Init.
 	 */
 	public function init() {
-		if ( function_exists( 'lazyblocks' ) && lazyblocks()->blocks() ) {
-			lazyblocks()->blocks()->maybe_sync_role_caps();
-		}
-
 		// Migration code added after `$this->initial_version` plugin version.
 		$saved_version   = get_option( 'lzb_db_version', $this->initial_version );
 		$current_version = LAZY_BLOCKS_VERSION;
@@ -61,6 +57,10 @@ public function init() {
 	 */
 	public function get_migrations() {
 		return array(
+			array(
+				'version' => '4.3.0',
+				'cb'      => array( $this, 'v_4_3_0_sync_role_caps' ),
+			),
 			array(
 				'version' => '2.5.0',
 				'cb'      => array( $this, 'v_2_5_0' ),
@@ -72,6 +72,17 @@ public function get_migrations() {
 		);
 	}
 
+	/**
+	 * Synchronize Lazy Blocks capabilities during the 4.3.0 upgrade path.
+	 *
+	 * @return void
+	 */
+	public function v_4_3_0_sync_role_caps() {
+		if ( function_exists( 'lazyblocks' ) && lazyblocks()->blocks() ) {
+			lazyblocks()->blocks()->sync_role_caps();
+		}
+	}
+
 	/**
 	 * Convert old templates to new one.
 	 */

lazy-blocks.php

@@ -120,7 +120,7 @@ public function __construct() {
 		 */
 		public function activation_hook() {
 			if ( $this->blocks ) {
-				$this->blocks->maybe_sync_role_caps();
+				$this->blocks->sync_role_caps();
 			}
 
 			LazyBlocks_Dummy::add();

tests/phpunit/CapabilitySyncTest.php

@@ -195,4 +195,15 @@ public function test_migration_syncs_role_caps_for_fresh_installs() {
 		$this->assert_lazyblocks_capability_matrix_applied();
 		$this->assertSame( LAZY_BLOCKS_VERSION, get_option( 'lzb_db_version' ) );
 	}
+
+	/**
+	 * Fresh installs should receive capabilities during plugin activation.
+	 */
+	public function test_activation_hook_syncs_role_caps_for_fresh_installs() {
+		$this->remove_lazyblocks_capabilities();
+
+		lazyblocks()->activation_hook();
+
+		$this->assert_lazyblocks_capability_matrix_applied();
+	}
 }