Merge pull request #20 from soderlind/refactor/plugin-updater

chore: bump version to 1.6.0, refactor plugin updater

Author: soderlind

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.6.0] - 2026-02-09
+
+### Changed
+
+- Replaced inline plugin updater with shared `class-github-updater.php`
+
 ## [1.5.1] - 2025-06-25
 
 ### Fixed

class-github-updater.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * GitHub Plugin Updater
+ *
+ * Minimal wrapper around yahnis-elsts/plugin-update-checker for GitHub-hosted
+ * WordPress plugins. Defers the actual update-checker setup to the `init` action
+ * so it works regardless of when the calling plugin loads the file.
+ *
+ * @package Soderlind\WordPress
+ * @version 1.0.0
+ * @author  Per Soderlind
+ * @license GPL-2.0-or-later
+ * @link    https://github.com/soderlind/wordpress-plugin-github-updater
+ */
+
+namespace Soderlind\WordPress;
+
+use YahnisElsts\PluginUpdateChecker\v5\PucFactory;
+
+// Prevent direct access.
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Sets up automatic plugin updates from a GitHub repository.
+ */
+final class GitHubUpdater {
+
+	/**
+	 * Initialize the GitHub update checker.
+	 *
+	 * @param string $github_url  Full GitHub repository URL (e.g. 'https://github.com/owner/repo').
+	 * @param string $plugin_file Absolute path to the main plugin file (__FILE__).
+	 * @param string $plugin_slug Plugin slug used by WordPress (e.g. 'my-plugin').
+	 * @param string $name_regex  Optional regex to filter release assets (e.g. '/my-plugin\.zip/').
+	 * @param string $branch      Branch to track (default 'main').
+	 */
+	public static function init(
+		string $github_url,
+		string $plugin_file,
+		string $plugin_slug,
+		string $name_regex = '',
+		string $branch = 'main',
+	): void {
+		add_action( 'init', static function () use ( $github_url, $plugin_file, $plugin_slug, $name_regex, $branch ): void {
+			try {
+				$checker = PucFactory::buildUpdateChecker( $github_url, $plugin_file, $plugin_slug );
+				$checker->setBranch( $branch );
+
+				if ( '' !== $name_regex ) {
+					$checker->getVcsApi()->enableReleaseAssets( $name_regex );
+				}
+			} catch ( \Exception $e ) {
+				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+					// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log
+					error_log( 'GitHubUpdater (' . $plugin_slug . '): ' . $e->getMessage() );
+				}
+			}
+		} );
+	}
+}

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vmfa-editorial-workflow",
-	"version": "1.5.1",
+	"version": "1.6.0",
 	"description": "Role-based folder access, move restrictions, and Inbox workflow for Virtual Media Folders.",
 	"author": "Per Soderlind",
 	"license": "GPL-2.0-or-later",

readme.txt

@@ -4,7 +4,7 @@ Tags: media, folders, workflow, editorial, permissions
 Requires at least: 6.8
 Tested up to: 6.9
 Requires PHP: 8.3
-Stable tag: 1.5.1
+Stable tag: 1.6.0
 License: GPL-2.0-or-later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -95,6 +95,9 @@ Existing media is not affected. The workflow only applies to new uploads and exp
 
 == Changelog ==
 
+= 1.6.0 =
+* Changed: Replaced inline plugin updater with shared `class-github-updater.php`
+
 = 1.5.1 =
 
 **Fixed**

src/php/Update/GitHubPluginUpdater.php

@@ -3,7 +3,7 @@
  * Plugin Name: Virtual Media Folders - Editorial Workflow
  * Plugin URI: https://github.com/soderlind/vmfa-editorial-workflow
  * Description: Role-based folder access, move restrictions, and Inbox workflow for Virtual Media Folders.
- * Version: 1.5.1
+ * Version: 1.6.0
  * Requires at least: 6.8
  * Requires PHP: 8.3
  * Tested up to: 6.9
@@ -26,24 +26,28 @@
 defined( 'ABSPATH' ) || exit;
 
 // Plugin constants.
-define( 'VMFA_EDITORIAL_WORKFLOW_VERSION', '1.5.1' );
+define( 'VMFA_EDITORIAL_WORKFLOW_VERSION', '1.6.0' );
 define( 'VMFA_EDITORIAL_WORKFLOW_FILE', __FILE__ );
 define( 'VMFA_EDITORIAL_WORKFLOW_PATH', plugin_dir_path( __FILE__ ) );
 define( 'VMFA_EDITORIAL_WORKFLOW_URL', plugin_dir_url( __FILE__ ) );
 
-// Initialize GitHub updater.
+// Autoload Composer dependencies.
 if ( file_exists( VMFA_EDITORIAL_WORKFLOW_PATH . 'vendor/autoload.php' ) ) {
 	require_once VMFA_EDITORIAL_WORKFLOW_PATH . 'vendor/autoload.php';
-	require_once VMFA_EDITORIAL_WORKFLOW_PATH . 'src/php/Update/GitHubPluginUpdater.php';
-	Update\GitHubPluginUpdater::create_with_assets(
-		'https://github.com/soderlind/vmfa-editorial-workflow',
-		__FILE__,
-		'vmfa-editorial-workflow',
-		'/vmfa-editorial-workflow\.zip/',
-		'main'
-	);
 }
 
+// Update checker via GitHub releases.
+if ( ! class_exists( \Soderlind\WordPress\GitHubUpdater::class ) ) {
+	require_once __DIR__ . '/class-github-updater.php';
+}
+\Soderlind\WordPress\GitHubUpdater::init(
+	github_url:  'https://github.com/soderlind/vmfa-editorial-workflow',
+	plugin_file: VMFA_EDITORIAL_WORKFLOW_FILE,
+	plugin_slug: 'vmfa-editorial-workflow',
+	name_regex:  '/vmfa-editorial-workflow\.zip/',
+	branch:      'main',
+);
+
 /**
  * Initialize the plugin.
  *