Skip to content

Commit

Permalink
Merge pull request #538 from MinnPost/action-scheduler-3.8
Browse files Browse the repository at this point in the history
Update supported WordPress version to 6.3 and PHP version to 7.0 to match the updated system requirements for Action Scheduler (see version 3.8 of that library). Action Scheduler does not currently force 7.0 in its composer library, so this plugin will follow that convention.
  • Loading branch information
jonathanstegall authored Jun 23, 2024
2 parents 078f9a2 + 05672e1 commit 9e4535e
Show file tree
Hide file tree
Showing 60 changed files with 144 additions and 121 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Donate link: https://www.minnpost.com/support/?campaign=7010G0000012fXGQAY
Tags: salesforce, sync, crm
Requires at least: 6.3
Tested up to: 6.5
Requires PHP: 5.6.20
Requires PHP: 7.0
Stable tag: 2.2.10
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Expand All @@ -39,8 +39,7 @@ To get started, install Object Sync for Salesforce from the [WordPress plugin re

### Requirements

1. A PHP installation of at least version 5.6.20.
2. A WordPress installation of at least version 6.3.
1. The minimum system requirements for the [Action Scheduler](https://actionscheduler.org/) library. Currently this library requires a PHP installation of at least version 7.0 and a WordPress installation of at least version 6.3.
3. SSL support.
4. A Salesforce account. Developers can register for a free Developer Edition account at [https://developer.salesforce.com/signup](https://developer.salesforce.com/signup)
5. A remote application/connected Salesforce app for authorization.
Expand Down
4 changes: 3 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
Changelog
=========

* 2.2.10 (2024-06-19)
* 2.2.10 (2024-06-23)
* Plugin status: Plugin status: as before, this plugin doesn't have any official maintainers. I try to check in occasionally if anyone submits pull requests or major issues and merge them if I can do so rather quickly. Updates will be given within the plugin if/when that status changes.
* Maintenance: Add a new filter to prevent new user notifications. Also prevents some possible errors that can happen when plugin options haven't been set. Thanks to @federicojacobi for the pull request.
* Maintenance: Update supported WordPress version to 6.3 and PHP version to 7.0 to match the updated system requirements for Action Scheduler (see version 3.8 of that library). Action Scheduler does not currently force 7.0 in its composer library, so this plugin will follow that convention.
* Maintenance: Update installed version of Action Scheduler to 3.8.1.

* 2.2.9 (2024-03-18)
* Plugin status: Plugin status: as before, this plugin doesn't have any official maintainers. I try to check in occasionally if anyone submits pull requests or major issues and merge them if I can do so rather quickly. Updates will be given within the plugin if/when that status changes.
Expand Down
2 changes: 2 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Changelog
* 2.2.10 (2024-06-19)
* Plugin status: Plugin status: as before, this plugin doesn't have any official maintainers. I try to check in occasionally if anyone submits pull requests or major issues and merge them if I can do so rather quickly. Updates will be given within the plugin if/when that status changes.
* Maintenance: Add a new filter to prevent new user notifications. Also prevents some possible errors that can happen when plugin options haven't been set. Thanks to @federicojacobi for the pull request.
* Maintenance: Update supported WordPress version to 6.3 and PHP version to 7.0 to match the updated system requirements for Action Scheduler (see version 3.8 of that library). Action Scheduler does not currently force 7.0 in its composer library, so this plugin will follow that convention.
* Maintenance: Update installed version of Action Scheduler to 3.8.1.

* 2.2.9 (2024-03-18)
* Plugin status: Plugin status: as before, this plugin doesn't have any official maintainers. I try to check in occasionally if anyone submits pull requests or major issues and merge them if I can do so rather quickly. Updates will be given within the plugin if/when that status changes.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"php": ">=5.6.20",
"pippinsplugins/wp-logging": "dev-master",
"messageagency/force.com-toolkit-for-php": "^1.0.2",
"woocommerce/action-scheduler": "^3.7.4"
"woocommerce/action-scheduler": "^3.8.1"
},
"require-dev": {
"php": ">=8.0",
Expand Down
34 changes: 17 additions & 17 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified docs/code/descriptors/0/G/+7VgjXfAKQKoaA6CfrMA
Binary file not shown.
Binary file modified docs/code/descriptors/3/O/TO6iusJoGxFz+Q5t8lGg
Binary file not shown.
Binary file modified docs/code/descriptors/5/T/S4bgd5GlnP9FPukjJoKw
Binary file not shown.
Binary file modified docs/code/descriptors/8/B/YUUawcRPu8iqa0H4uRzA
Binary file not shown.
Binary file modified docs/code/descriptors/B/-/1+ZFQIQCW6ewPhwya+7A
Binary file not shown.
Binary file modified docs/code/descriptors/C/C/kht7TWrAW3Zyu5uTdcQQ
Binary file not shown.
Binary file modified docs/code/descriptors/C/P/QzamooI5tyvbw57Vo4UA
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/code/descriptors/D/D/m0G1Z9xVFKtNtCQFoi5w
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
1750330283
1750707113
gFFBC%2BJB4H%3AphpDocumentor-projectDescriptor-filelist
a:20:{i:0;s:70:"phpDocumentor-projectDescriptor-files-a197e16b2a6efaafc88a9ced4787a498";i:1;s:70:"phpDocumentor-projectDescriptor-files-c54f0561f508342becf326dd573d67f1";i:2;s:70:"phpDocumentor-projectDescriptor-files-cbc33ccccab98f739916428912712005";i:3;s:70:"phpDocumentor-projectDescriptor-files-c23130d9f2401a6b3d8e8cc0b318d5f5";i:4;s:70:"phpDocumentor-projectDescriptor-files-ac31461483f378c45fd79a3bc4a278f7";i:5;s:70:"phpDocumentor-projectDescriptor-files-0b92437b7c3d65a3e524d59bb5f365fc";i:6;s:70:"phpDocumentor-projectDescriptor-files-00b003fcb5ae23fd23d218064bc156a0";i:7;s:70:"phpDocumentor-projectDescriptor-files-71cb9101900faab78d5e042d4c7be950";i:8;s:70:"phpDocumentor-projectDescriptor-files-9e2f10484fc8232b68f4b08936085e38";i:9;s:70:"phpDocumentor-projectDescriptor-files-d2d3e6048fdf494850552cc81e1da9b0";i:10;s:70:"phpDocumentor-projectDescriptor-files-8a2841e07bdce0d0d65a7570f61e7f2c";i:11;s:70:"phpDocumentor-projectDescriptor-files-a3d429d347a190e48f8b25b9e931be13";i:12;s:70:"phpDocumentor-projectDescriptor-files-04a7ed2e6fb0a3a9667314412e25c5de";i:13;s:70:"phpDocumentor-projectDescriptor-files-f9be6a4d427bb37703a7c421b734254a";i:14;s:70:"phpDocumentor-projectDescriptor-files-9661ac8873f1e1c9f12dbaea51266d62";i:15;s:70:"phpDocumentor-projectDescriptor-files-27205ab2caa20f664d8b13529d7b6f8b";i:16;s:70:"phpDocumentor-projectDescriptor-files-45763d6b2355a3b1ce455dad3cacbc75";i:17;s:70:"phpDocumentor-projectDescriptor-files-0db900c722f7e7efe25b2dd3f780ac94";i:18;s:70:"phpDocumentor-projectDescriptor-files-86b47aa138dc286c582dd6d52721ec27";i:19;s:70:"phpDocumentor-projectDescriptor-files-1e6eb137ec04d15b065e6fc5822ca51c";}
Binary file modified docs/code/descriptors/D/Z/M+Ras2gGnth7Tav5HLMw
Binary file not shown.
Binary file modified docs/code/descriptors/I/2/Lzc4Rv8B36jFwSeAdvOw
Binary file not shown.
Binary file modified docs/code/descriptors/I/P/IsZ+pa6gN2Lk1CPVVTag
Binary file not shown.
Binary file modified docs/code/descriptors/K/Q/5wyEdhMAa8gmNSqb5hxQ
Binary file not shown.
Binary file modified docs/code/descriptors/L/K/gmm8kpZ97JfNG1Atj-3g
Binary file not shown.
Binary file modified docs/code/descriptors/L/W/IhoQA4tk2+AJ66PYubTw
Binary file not shown.
Binary file modified docs/code/descriptors/M/O/-K+YQ-4Nbl8DuVY65zbA
Binary file not shown.
Binary file modified docs/code/descriptors/N/K/Y016h91Dbee8CwXjhvng
Binary file not shown.
Binary file modified docs/code/descriptors/O/R/8hCFVjL2Mft4c+KHvO2g
Binary file not shown.
Binary file modified docs/code/descriptors/V/X/BlA7hbhOXKDmRnbkVcaQ
Binary file not shown.
Binary file modified docs/code/descriptors/W/F/bL0cpVWs5Zk+-ryT1CXw
Binary file not shown.
Binary file modified docs/code/descriptors/X/1/9WEmmzoHqbtqWEq7XVeQ
Binary file not shown.
Binary file modified docs/code/descriptors/X/V/WxXrMkRMavVIyynhUhfg
Binary file not shown.
Binary file modified docs/code/descriptors/Y/X/QOO+wTwFKqCrRIHZ8bKw
Binary file not shown.
2 changes: 1 addition & 1 deletion phpcs.xml.dist
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<ruleset name="Object Sync for Salesforce">
<config name="testVersion" value="5.6.20-"/>
<config name="testVersion" value="7.0-"/>
<config name="minimum_supported_wp_version" value="6.3" />

<rule ref="WordPress-Core"/>
Expand Down
2 changes: 1 addition & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Donate link: https://www.minnpost.com/support/?campaign=7010G0000012fXGQAY
Tags: salesforce, sync, crm
Requires at least: 6.3
Tested up to: 6.5
Requires PHP: 5.6.20
Requires PHP: 7.0
Stable tag: 2.2.10
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Expand Down
8 changes: 4 additions & 4 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@
},
{
"name": "woocommerce/action-scheduler",
"version": "3.7.4",
"version_normalized": "3.7.4.0",
"version": "3.8.1",
"version_normalized": "3.8.1.0",
"source": {
"type": "git",
"url": "https://github.com/woocommerce/action-scheduler.git",
"reference": "5fb655253dc004bb7a6d840da807f0949aea8bcd"
"reference": "e331b534d7de10402d7545a0de50177b874c0779"
},
"require": {
"php": ">=5.6"
Expand All @@ -94,7 +94,7 @@
"wp-cli/wp-cli": "~2.5.0",
"yoast/phpunit-polyfills": "^2.0"
},
"time": "2024-04-05T14:42:07+00:00",
"time": "2024-06-20T19:53:06+00:00",
"type": "wordpress-plugin",
"extra": {
"scripts-description": {
Expand Down
10 changes: 5 additions & 5 deletions vendor/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'name' => 'minnpost/object-sync-for-salesforce',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '3c4b2420cbd6394de2f11cb95c96a0b054085888',
'reference' => '078f9a23037d32cc61949aca005a5502b87fd38a',
'type' => 'wordpress-plugin',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand All @@ -24,7 +24,7 @@
'minnpost/object-sync-for-salesforce' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '3c4b2420cbd6394de2f11cb95c96a0b054085888',
'reference' => '078f9a23037d32cc61949aca005a5502b87fd38a',
'type' => 'wordpress-plugin',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand All @@ -42,9 +42,9 @@
'dev_requirement' => false,
),
'woocommerce/action-scheduler' => array(
'pretty_version' => '3.7.4',
'version' => '3.7.4.0',
'reference' => '5fb655253dc004bb7a6d840da807f0949aea8bcd',
'pretty_version' => '3.8.1',
'version' => '3.8.1.0',
'reference' => 'e331b534d7de10402d7545a0de50177b874c0779',
'type' => 'wordpress-plugin',
'install_path' => __DIR__ . '/../woocommerce/action-scheduler',
'aliases' => array(),
Expand Down
2 changes: 1 addition & 1 deletion vendor/woocommerce/action-scheduler/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Action Scheduler is a scalable, traceable job queue for background processing large sets of actions in WordPress. It's specially designed to be distributed in WordPress plugins.

Action Scheduler works by triggering an action hook to run at some time in the future. Each hook can be scheduled with unique data, to allow callbacks to perform operations on that data. The hook can also be scheduled to run on one or more occassions.
Action Scheduler works by triggering an action hook to run at some time in the future. Each hook can be scheduled with unique data, to allow callbacks to perform operations on that data. The hook can also be scheduled to run on one or more occasions.

Think of it like an extension to `do_action()` which adds the ability to delay and repeat a hook.

Expand Down
14 changes: 7 additions & 7 deletions vendor/woocommerce/action-scheduler/action-scheduler.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Description: A robust scheduling library for use in WordPress plugins.
* Author: Automattic
* Author URI: https://automattic.com/
* Version: 3.7.4
* Version: 3.8.1
* License: GPLv3
* Requires at least: 6.2
* Tested up to: 6.5
Expand All @@ -29,29 +29,29 @@
* @package ActionScheduler
*/

if ( ! function_exists( 'action_scheduler_register_3_dot_7_dot_4' ) && function_exists( 'add_action' ) ) { // WRCS: DEFINED_VERSION.
if ( ! function_exists( 'action_scheduler_register_3_dot_8_dot_1' ) && function_exists( 'add_action' ) ) { // WRCS: DEFINED_VERSION.

if ( ! class_exists( 'ActionScheduler_Versions', false ) ) {
require_once __DIR__ . '/classes/ActionScheduler_Versions.php';
add_action( 'plugins_loaded', array( 'ActionScheduler_Versions', 'initialize_latest_version' ), 1, 0 );
}

add_action( 'plugins_loaded', 'action_scheduler_register_3_dot_7_dot_4', 0, 0 ); // WRCS: DEFINED_VERSION.
add_action( 'plugins_loaded', 'action_scheduler_register_3_dot_8_dot_1', 0, 0 ); // WRCS: DEFINED_VERSION.

// phpcs:disable Generic.Functions.OpeningFunctionBraceKernighanRitchie.ContentAfterBrace
/**
* Registers this version of Action Scheduler.
*/
function action_scheduler_register_3_dot_7_dot_4() { // WRCS: DEFINED_VERSION.
function action_scheduler_register_3_dot_8_dot_1() { // WRCS: DEFINED_VERSION.
$versions = ActionScheduler_Versions::instance();
$versions->register( '3.7.4', 'action_scheduler_initialize_3_dot_7_dot_4' ); // WRCS: DEFINED_VERSION.
$versions->register( '3.8.1', 'action_scheduler_initialize_3_dot_8_dot_1' ); // WRCS: DEFINED_VERSION.
}

// phpcs:disable Generic.Functions.OpeningFunctionBraceKernighanRitchie.ContentAfterBrace
/**
* Initializes this version of Action Scheduler.
*/
function action_scheduler_initialize_3_dot_7_dot_4() { // WRCS: DEFINED_VERSION.
function action_scheduler_initialize_3_dot_8_dot_1() { // WRCS: DEFINED_VERSION.
// A final safety check is required even here, because historic versions of Action Scheduler
// followed a different pattern (in some unusual cases, we could reach this point and the
// ActionScheduler class is already defined—so we need to guard against that).
Expand All @@ -63,7 +63,7 @@ function action_scheduler_initialize_3_dot_7_dot_4() { // WRCS: DEFINED_VERSION.

// Support usage in themes - load this version if no plugin has loaded a version yet.
if ( did_action( 'plugins_loaded' ) && ! doing_action( 'plugins_loaded' ) && ! class_exists( 'ActionScheduler', false ) ) {
action_scheduler_initialize_3_dot_7_dot_4(); // WRCS: DEFINED_VERSION.
action_scheduler_initialize_3_dot_8_dot_1(); // WRCS: DEFINED_VERSION.
do_action( 'action_scheduler_pre_theme_init' );
ActionScheduler_Versions::initialize_latest_version();
}
Expand Down
14 changes: 11 additions & 3 deletions vendor/woocommerce/action-scheduler/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
*** Changelog ***

= 3.8.1 - 2024-06-20 =
* Fix typos.
* Improve the messaging in our unidentified action exceptions.

= 3.8.0 - 2024-05-22 =
* Documentation - Fixed typos in perf.md.
* Update - We now require WordPress 6.3 or higher.
* Update - We now require PHP 7.0 or higher.

= 3.7.4 - 2024-04-05 =
* Give a clear description of how the $unique parameter works.
* Merge release/3.7.3 into trunk.
* Preserve the tab field if set.
* Tweak - WP 6.5 compatibility.

Expand All @@ -22,7 +30,7 @@

= 3.7.0 - 2023-11-20 =
* Important: starting with this release, Action Scheduler follows an L-2 version policy (WordPress, and consequently PHP).
* Add extended indexes for hook_status_scheduled_date_gmt and status_sheduled_date_gmt.
* Add extended indexes for hook_status_scheduled_date_gmt and status_scheduled_date_gmt.
* Catch and log exceptions thrown when actions can't be created, e.g. under a corrupt database schema.
* Tweak - WP 6.4 compatibility.
* Update unit tests for upcoming dependency version policy.
Expand Down Expand Up @@ -117,7 +125,7 @@
* Dev - ActionScheduler_wcSystemStatus PHPCS fixes (props @ovidiul). #761
* Dev - ActionScheduler_DBLogger.php PHPCS fixes (props @ovidiul). #768
* Dev - Fixed phpcs for ActionScheduler_Schedule_Deprecated (props @ovidiul). #762
* Dev - Improve actions table indicies (props @glagonikas). #774 & #777
* Dev - Improve actions table indices (props @glagonikas). #774 & #777
* Dev - PHPCS fixes for ActionScheduler_DBStore.php (props @ovidiul). #769 & #778
* Dev - PHPCS Fixes for ActionScheduler_Abstract_ListTable (props @ovidiul). #763 & #779
* Dev - Adds new filter action_scheduler_claim_actions_order_by to allow tuning of the claim query (props @glagonikas). #773
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ public function repeat( $action ) {
* This general purpose method can be used in place of specific methods such as async(),
* async_unique(), single() or single_unique(), etc.
*
* @internal Not intended for public use, should not be overriden by subclasses.
* @internal Not intended for public use, should not be overridden by subclasses.
*
* @param array $options {
* Describes the action we wish to schedule.
Expand Down Expand Up @@ -357,7 +357,7 @@ protected function store_unique_action( ActionScheduler_Action $action ) {
/**
* Fallback to non-unique action if the store doesn't support unique actions.
* We try to save the action as unique, accepting that there might be a race condition.
* This is likely still better than givinig up on unique actions entirely.
* This is likely still better than giving up on unique actions entirely.
*/
$existing_action_id = (int) $store->find_action(
$action->get_hook(),
Expand Down
Loading

0 comments on commit 9e4535e

Please sign in to comment.