Merge pull request #14 from iamsayan/develop

feat: update Action Scheduler to version 3.9.2 and add WP CLI commands

Author: iamsayan

CHANGELOG.md

@@ -4,6 +4,28 @@ If you like Advanced Cron Scheduler plugin, please take a moment to [give a 5-st
 
 All notable changes to this project will be documented in this file.
 
+## 1.1.4
+Release Date: 29th April, 2025
+
+* Fixed: Wrong Settings URL.
+* Fixed: PHPCS Issues.
+* Updated: Action Scheduler library to v3.9.2.
+* Minimum WordPress supported version is now 6.5.0.
+* Tested up to WordPress 6.8.
+
+## 1.1.3
+Release Date: 3rd January, 2025
+
+* Fixed: Issue with migration of WP Cron events.
+
+## 1.1.2
+Release Date: 2nd January, 2025
+
+* Added: Support for Customizing the Action Scheduler.
+* Updated: Action Scheduler library to v3.9.0.
+* Minimum PHP supported version is now 7.1.
+* Tested up to WordPress 6.7.
+
 ## 1.1.1
 Release Date: 1st March, 2024
 

composer.lock

@@ -34,7 +34,7 @@ public function register() {
 	 * Register settings link.
 	 */
 	public function settings_link( $links ) {
-		$links[] = '<a href="' . admin_url( 'options-general.php#acswp-settings' ) . '">' . __( 'Settings', 'migrate-wp-cron-to-action-scheduler' ) . '</a>';
+		$links[] = '<a href="' . admin_url( 'options-general.php?page=advanced-cron-scheduler' ) . '">' . __( 'Settings', 'migrate-wp-cron-to-action-scheduler' ) . '</a>';
 		$links[] = '<a href="' . admin_url( 'tools.php?page=action-scheduler' ) . '">' . __( 'Action Scheduler', 'migrate-wp-cron-to-action-scheduler' ) . '</a>';
 
 		return $links;

includes/Base/Actions.php

@@ -186,7 +186,7 @@ public function data_retention_period_field() { ?>
 					?>
 				</select>
 			</div>
-			<small>By default, Action Scheduler deletes completed actions every 30 days. Use this field to set a default actions delete duration.</small>
+			<small><?= esc_html__( 'By default, Action Scheduler deletes completed actions every 30 days. Use this field to set a default actions delete duration.', 'migrate-wp-cron-to-action-scheduler' ); ?></small>
 		</div>
 		<?php
 	}

includes/Core/Settings.php

@@ -152,7 +152,7 @@ protected function get_protected_hooks() {
     /**
 	 * Get settings.
 	 */
-	protected function get_settings( $key, $default = null ) {
+	protected function get_settings( $key, $default_value = null ) {
 		$settings = get_option( 'acswp_settings', [] );
         if ( empty( $settings ) || ! is_array( $settings ) ) {
             $settings = [];
@@ -162,6 +162,6 @@ protected function get_settings( $key, $default = null ) {
             return $settings[ $key ];
         }
 
-		return $default;
+		return $default_value;
 	}
 }

includes/Helpers/HelperFunctions.php

@@ -41,6 +41,7 @@ public static function get_services() {
 	public static function register_services() {
 		foreach ( self::get_services() as $class ) {
 			$service = self::instantiate( $class );
+			
 			if ( method_exists( $service, 'register' ) ) {
 				$service->register();
 			}
@@ -53,8 +54,8 @@ public static function register_services() {
 	 * @param  class $class    class from the services array
 	 * @return class instance  new instance of the class
 	 */
-	private static function instantiate( $class ) {
-		$service = new $class();
+	private static function instantiate( $service_class ) {
+		$service = new $service_class();
 
 		return $service;
 	}

includes/Loader.php

@@ -3,7 +3,7 @@
  * Plugin Name: Advanced Cron Scheduler for WordPress
  * Plugin URI: https://wordpress.org/plugins/migrate-wp-cron-to-action-scheduler/
  * Description: The Advanced Cron Scheduler plugin helps to easily replace or migrate Native WordPress Cron to the Action Scheduler Library.
- * Version: 1.1.3
+ * Version: 1.1.4
  * Author: Sayan Datta
  * Author URI: https://www.sayandatta.co.in
  * License: GPLv3
@@ -44,7 +44,7 @@ final class ACSWP {
 	 *
 	 * @var string
 	 */
-	public $version = '1.1.3';
+	public $version = '1.1.4';
 
 	/**
 	 * Minimum version of WordPress required to run ACSWP.
@@ -211,7 +211,7 @@ function () {
  *
  * @return ACSWP
  */
-function acswp() {
+function acswp() { // phpcs:ignore Universal.Files.SeparateFunctionsFromOO.Mixed
 	return ACSWP::get();
 }
 

migrate-wp-cron-to-action-scheduler.php

@@ -1,9 +1,9 @@
 === Advanced Cron Scheduler for WordPress ===
 Contributors: infosatech
 Tags: scheduler, wp cron, debug, cron manager, action scheduler
-Requires at least: 5.2
-Tested up to: 6.7
-Stable tag: 1.1.3
+Requires at least: 6.5
+Tested up to: 6.8
+Stable tag: 1.1.4
 Requires PHP: 7.1
 Donate link: https://www.paypal.me/iamsayan/
 License: GPLv3
@@ -95,6 +95,15 @@ Yes, our plugins work independently of themes you are using. As long as your web
 
 If you like Advanced Cron Scheduler, please take a moment to [give a 5-star rating](https://wordpress.org/support/plugin/migrate-wp-cron-to-action-scheduler/reviews/#new-post). It helps to keep development and support going strong. Thank you!
 
+= 1.1.4 =
+Release Date: 29th April, 2025
+
+* Fixed: Wrong Settings URL.
+* Fixed: PHPCS Issues.
+* Updated: Action Scheduler library to v3.9.2.
+* Minimum WordPress supported version is now 6.5.0.
+* Tested up to WordPress 6.8.
+
 = 1.1.3 =
 Release Date: 3rd January, 2025
 

readme.txt

@@ -14,10 +14,7 @@
             echo $err;
         }
     }
-    trigger_error(
-        $err,
-        E_USER_ERROR
-    );
+    throw new RuntimeException($err);
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';

vendor/autoload.php

@@ -26,12 +26,23 @@
  */
 class InstalledVersions
 {
+    /**
+     * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
+     * @internal
+     */
+    private static $selfDir = null;
+
     /**
      * @var mixed[]|null
      * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
      */
     private static $installed;
 
+    /**
+     * @var bool
+     */
+    private static $installedIsLocalDir;
+
     /**
      * @var bool|null
      */
@@ -309,6 +320,24 @@ public static function reload($data)
     {
         self::$installed = $data;
         self::$installedByVendor = array();
+
+        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
+        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
+        // so we have to assume it does not, and that may result in duplicate data being returned when listing
+        // all installed packages for example
+        self::$installedIsLocalDir = false;
+    }
+
+    /**
+     * @return string
+     */
+    private static function getSelfDir()
+    {
+        if (self::$selfDir === null) {
+            self::$selfDir = strtr(__DIR__, '\\', '/');
+        }
+
+        return self::$selfDir;
     }
 
     /**
@@ -325,19 +354,24 @@ private static function getInstalled()
         $copiedLocalDir = false;
 
         if (self::$canGetVendors) {
+            $selfDir = self::getSelfDir();
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                $vendorDir = strtr($vendorDir, '\\', '/');
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
                 } elseif (is_file($vendorDir.'/composer/installed.php')) {
                     /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
                     $required = require $vendorDir.'/composer/installed.php';
                     self::$installedByVendor[$vendorDir] = $required;
                     $installed[] = $required;
-                    if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
                         self::$installed = $required;
-                        $copiedLocalDir = true;
+                        self::$installedIsLocalDir = true;
                     }
                 }
+                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
+                    $copiedLocalDir = true;
+                }
             }
         }