Merge pull request #188 from WC-Local-Pickup/release/1.4.2

Maintenance Release 1.4.2

.github/workflows/unit-testing.yml

@@ -6,7 +6,7 @@ on:
   # Triggers the workflow on push events only for the matching branches
   push:
     branches:
-      - develop
+      - 'release/**'
 
 env:
   COMPOSER_VERSION: '2.2'
@@ -21,9 +21,9 @@ jobs:
       fail-fast: false
       matrix:
         job-name: ['Unit Test']
-        php-version: ['7.2','7.3','7.4','8.0']
-        wordpress-version: ['5.5.*','5.6.*','5.7.*','5.8.*','5.9.*']
-        woocommerce-version: ['4.0.*','4.*','5.0.*','5.*','6.0.*','6.4.*']
+        php-version: ['7.4','8.0']
+        wordpress-version: ['5.7.*','5.8.*','5.9.*']
+        woocommerce-version: ['4.*','5.0.*','5.*','6.0.*','6.4.*']
         wp-multisite-mode: [0]
         bleeding-edge: [false]
         include:
@@ -92,10 +92,6 @@ jobs:
       if: matrix.php-version != '7.3' && matrix.php-version != '7.2' && ! matrix.bleeding-edge
       run: composer require johnpbloch/wordpress-core:${{ matrix.wordpress-version }} php-stubs/wordpress-stubs:${{ matrix.wordpress-version }} wp-phpunit/wp-phpunit:${{ matrix.wordpress-version }} wpackagist-plugin/woocommerce:${{ matrix.woocommerce-version }} php-stubs/woocommerce-stubs:${{ matrix.woocommerce-version }} --dev --prefer-source --update-with-all-dependencies
 
-    - name: Require Specified WooCommerce Admin Version
-      if: matrix.woocommerce-version == 'dev-master'
-      run: composer require woocommerce/woocommerce-admin:v1.3.0-beta.1 --dev --prefer-source --update-with-all-dependencies
-
     - name: PHPUnit Bleeding Edge Support
       if: matrix.bleeding-edge
       run: |

.gitignore

@@ -12,9 +12,12 @@
 
 # Local Development files/folders.
 .env
+.wp-env.override.json
 phpcs.xml
 phpstan.neon
 phpunit.xml
+tools/local-env/mu-plugins/mu-require.php
+tools/local-env/mu-plugins/wp-local-media-proxy
 
 # OS or Editor folders
 .DS_Store

.wp-env.json

@@ -5,19 +5,22 @@
 	"mappings": {
 		"wp-content/mu-plugins": "./tools/local-env/mu-plugins",
 		"wp-content/config": "./tools/local-env/config",
-		"wp-content/uploads/backups": "./tools/local-env/backups"
+		"wp-content/uploads/backups": "./tools/local-env/backups",
+		"../vendor": "./vendor"
 	},
 	"env": {
 		"development": {
 			"plugins": [
 				".",
 				"https://downloads.wordpress.org/plugin/debug-bar.zip",
-				"https://downloads.wordpress.org/plugin/query-monitor.zip",
 				"https://downloads.wordpress.org/plugin/debug-bar-post-meta.zip",
+				"https://downloads.wordpress.org/plugin/display-environment-type.zip",
+				"https://downloads.wordpress.org/plugin/query-monitor.zip",
 				"https://downloads.wordpress.org/plugin/transients-manager.zip",
+				"https://downloads.wordpress.org/plugin/woo-order-test.zip",
+				"https://downloads.wordpress.org/plugin/wordpress-importer.zip",
 				"https://downloads.wordpress.org/plugin/wp-cfm.zip",
-				"https://downloads.wordpress.org/plugin/wp-mail-logging.zip",
-				"https://downloads.wordpress.org/plugin/wordpress-importer.zip"
+				"https://downloads.wordpress.org/plugin/wp-mail-logging.zip"
 			],
 			"themes": ["https://downloads.wordpress.org/theme/storefront.zip"]
 		},
@@ -28,6 +31,7 @@
 	"config": {
 		"PHP_INI_MEMORY_LIMIT": "512M",
 		"WP_MEMORY_LIMIT": "512M",
+		"WP_ENVIRONMENT_TYPE": "local",
 		"WP_DEBUG": true,
 		"WP_DEBUG_LOG": true,
 		"WP_DEBUG_DISPLAY": false,

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.4.2
+
+### Fixed
+
+- Checkout prevented on non-Local Shipping methods.
+- Updated WordPress Supported Versions.
+
 ## 1.4.1
 
 ### Changed

README.md

@@ -3,8 +3,8 @@
 **Donate link:** https://www.ndigitals.com/donate/  
 **Tags:** woocommcerce, shipping, local pickup, checkout fields, ecommerce, e-commerce, wordpress ecommerce  
 **Requires at least:** 4.9  
-**Tested up to:** 5.9.3  
-**Stable tag:** 1.4.1  
+**Tested up to:** 6.0.1  
+**Stable tag:** 1.4.2  
 **Requires PHP:** 7.2  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
@@ -84,6 +84,11 @@ The location, by default, is hooked to `woocommerce_admin_order_data_after_billi
 
 ## Changelog ##
 
+### 1.4.2
+#### Fixed
+- Checkout prevented on non-Local Shipping methods.
+- Updated WordPress Supported Versions.
+
 ### 1.4.1
 #### Changed
 - Updated the README to provide details and usage on the latest functionality and features.

composer.json

@@ -33,7 +33,8 @@
 			"dealerdirect/phpcodesniffer-composer-installer": true,
 			"johnpbloch/wordpress-core-installer": true,
 			"phpro/grumphp": true,
-			"phpstan/extension-installer": true
+			"phpstan/extension-installer": true,
+			"boxuk/wp-muplugin-loader": true
 		}
 	},
 	"repositories": [
@@ -44,7 +45,7 @@
 	],
 	"require": {
 		"php": ">=7.4",
-		"composer/installers": "~1.0"
+		"composer/installers": "^2.0"
 	},
 	"require-dev": {
 		"php": ">=7.4",
@@ -53,6 +54,7 @@
 		"johnpbloch/wordpress-core": "~5.9.0",
 		"johnpbloch/wordpress-core-installer": "^2.0",
 		"mockery/mockery": "^1.3",
+		"ndigitals/wp-local-media-proxy": "^1.1",
 		"php-stubs/woocommerce-stubs": "~6.4.0",
 		"php-stubs/wordpress-stubs": "~5.9.0",
 		"phpcompatibility/php-compatibility": "^9.0",
@@ -65,13 +67,11 @@
 		"roave/security-advisories": "dev-master",
 		"squizlabs/php_codesniffer": "^3.3",
 		"szepeviktor/phpstan-wordpress": "^1.0",
-		"woocommerce/action-scheduler": "~3.4.0",
-		"woocommerce/woocommerce-admin": "~3.3.0",
-		"woocommerce/woocommerce-blocks": "~7.3.0",
+		"woocommerce/action-scheduler": "~3.4.2",
 		"woocommerce/woocommerce-sniffs": "~0.1.0",
 		"wp-coding-standards/wpcs": "^2.2",
 		"wp-phpunit/wp-phpunit": "~5.9.0",
-		"wpackagist-plugin/woocommerce": "~6.4.0",
+		"wpackagist-plugin/woocommerce": "6.4.1",
 		"yoast/phpunit-polyfills": "^1.0"
 	},
 	"autoload": {
@@ -114,7 +114,7 @@
 			"wordpress/wp-content/plugins/{$name}": [
 				"type:wordpress-plugin"
 			],
-			"wordpress/wp-content/mu-plugins/{$name}": [
+			"tools/local-env/mu-plugins/{$name}": [
 				"type:wordpress-muplugin"
 			],
 			"wordpress/wp-content/themes/{$name}": [