Merge pull request #84 from BeAPI/ver/6.1.20

Release 6.1.20

.distignore

@@ -4,7 +4,6 @@
 bin
 node_modules
 tests
-vendor
 wordpress
 .distignore
 .dockerignore

.lando.dist.yml

@@ -1,7 +1,7 @@
 name: shoppingfeed-for-woocommerce
 recipe: wordpress
 config:
-  php: '7.1'
+  php: '7.3'
   webroot: ./wordpress/
 env:
   - .env.testing

.plugin-data

@@ -1,4 +1,4 @@
 {
-    "version": "6.1.19",
+    "version": "6.1.20",
     "slug": "shopping-feed"
 }

grumphp.yml

@@ -1,5 +1,5 @@
 # grumphp.yml
-parameters:
+grumphp:
   tasks:
     git_blacklist:
       keywords:

readme.md

@@ -2,19 +2,22 @@
 
 * Contributors: ShoppingFeed, BeAPI
 * Tags: shoppingfeed, marketplace, woocommerce, woocommerce shoppingfeed, create woocommerce products shoppingfeed, products feed, generate shoppingfeed, amazon, Jet, Walmart, many marketplace, import orders
-* Stable tag: 6.1.19
-* Version: 6.1.19
-* Requires PHP: 5.6
-* Requires at least: 5.2
-* Tested up to: 5.8.0
-* WC requires at least: 3.8
-* WC tested up to: 5.5.2
+* Stable tag: 6.1.20
+* Version: 6.1.20
+* Requires PHP: 7.1
+* Requires at least: 5.7
+* Tested up to: 6.2
+* WC requires at least: 5.1.0
+* WC tested up to: 7.7
 
 ## Upgrade Notice
 
 > Version 6.0.0 is a major version, there are several changes and improvements which affect the architecture of the plugin. You will have to re-configure the plugin, all the previous settings will be lost
 
 ## Changelog
+* 6.1.20
+  * Fix an issue with migration process failing to be scheduled with new version of Woocommerce.
+  * Update plugin requirements
 * 6.1.19
   * Update 'shopping_feed_variation_images' filter to include the WC variation ID.
 * 6.1.18

readme.txt

@@ -1,8 +1,8 @@
 ## ShoppingFeed
 Contributors: ShoppingFeed, BeAPI
 Tags: shoppingfeed, marketplace, woocommerce, woocommerce shoppingfeed, create woocommerce products shoppingfeed, products feed, generate shoppingfeed, amazon, Jet, Walmart, many marketplace, import orders
-Stable tag: 6.1.19
-Version: 6.1.19
+Stable tag: 6.1.20
+Version: 6.1.20
 Requires PHP: 7.1
 Requires at least: 5.7
 Tested up to: 6.2
@@ -13,6 +13,9 @@ WC tested up to: 7.7
 Version 6.0.0 is a major version, there are several changes and improvements which affect the architecture of the plugin. You will have to re-configure the plugin, all the previous settings will be lost
 
 == Changelog ==
+* 6.1.20
+  * Fix an issue with migration process failing to be scheduled with new version of Woocommerce.
+  * Update plugin requirements
 * 6.1.19
   * Update 'shopping_feed_variation_images' filter to include the WC variation ID.
 * 6.1.18

shoppingfeed.php

@@ -7,7 +7,7 @@
  * Author URI:           https://www.shopping-feed.com/
  * Text Domain:          shopping-feed
  * Domain Path:          /languages
- * Version:              6.1.19
+ * Version:              6.1.20
  * Requires at least:    5.7
  * Requires PHP:         7.1
  * WC requires at least: 5.1.0
@@ -26,7 +26,7 @@
 	require_once plugin_dir_path( __FILE__ ) . '/vendor/autoload.php';
 }
 
-define( 'SF_VERSION', '6.1.19' );
+define( 'SF_VERSION', '6.1.20' );
 define( 'SF_DB_VERSION_SLUG', 'SF_DB_VERSION' );
 define( 'SF_DB_VERSION', '1.0.0' );
 define( 'SF_UPGRADE_RUNNING', 'SF_UPGRADE_RUNNING' );

src/ShoppingFeed.php

@@ -121,6 +121,7 @@ private function __construct() {
 		$this->actions = new WoocommerceActions();
 
 		//Check Upgrade
+		add_action( 'init', array( $this, 'do_migration' ), 25 );
 		if ( ! $this->check_upgrade() ) {
 			return;
 		}
@@ -290,19 +291,6 @@ function () {
 			return false;
 		}
 
-		//check if we need to do migration
-		if (
-			! empty( $_GET['sf_action'] ) &&
-			'sf_migrate_single' === $_GET['sf_action'] &&
-			isset( $_GET['_wpnonce'] ) &&
-			wp_verify_nonce( wp_unslash( $_GET['_wpnonce'] ), 'sf_migrate_single' ) // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-		) {
-			$id_action = as_enqueue_async_action( 'sf_migrate_single_action', array(), 'sf_migrate_single' );
-			update_option( SF_UPGRADE_RUNNING, $id_action );
-			wp_safe_redirect( admin_url( '/' ), 302 );
-			exit;
-		}
-
 		add_action(
 			'admin_notices',
 			function () {
@@ -331,4 +319,19 @@ function () {
 
 		return false;
 	}
+
+	public function do_migration(): void {
+		//check if we need to do migration
+		if (
+			! empty( $_GET['sf_action'] ) &&
+			'sf_migrate_single' === $_GET['sf_action'] &&
+			isset( $_GET['_wpnonce'] ) &&
+			wp_verify_nonce( wp_unslash( $_GET['_wpnonce'] ), 'sf_migrate_single' ) // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+		) {
+			$id_action = as_enqueue_async_action( 'sf_migrate_single_action', array(), 'sf_migrate_single' );
+			update_option( SF_UPGRADE_RUNNING, $id_action );
+			wp_safe_redirect( admin_url( '/' ), 302 );
+			exit;
+		}
+	}
 }