Fix/phone validation

.github/workflows/php-unit-on-pr.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       # Checkout the repository
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # PHP setup
       - name: Setup PHP ${{ matrix.php }}
@@ -37,22 +37,22 @@ jobs:
 
       # Use node version from .nvmrc
       - name: Setup NodeJS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 
       # Cache composer dependencies
       - name: Cache composer dependencies
         id: composer-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v1
         with:
           path: ./vendor
           key: ${{ runner.os }}-vendor-${{ hashFiles('composer.lock') }}
 
       # Cache node dependencies
       - name: Cache node dependencies
         id: node-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ./node_modules
           key:  ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json') }}
@@ -76,7 +76,7 @@ jobs:
       # Prepare test environment
       - name: Prepare test environment
         run: |
-          bash tests/bin/install-phpunit-tests-dependencies.sh wc_apa_test root root 127.0.0.1 latest
+          bash tests/bin/install-phpunit-tests-dependencies.sh wc_apa_test root root 127.0.0.1 latest ${{ matrix.php }}
 
       # Run tests
       - name: Run tests

src/js/payments-methods/classic/_payment-methods.js

@@ -47,7 +47,8 @@ const AmazonPayBtn = ( props ) => {
 					return true;
 				}
 				const shippingPhone = document.getElementById( 'shipping-phone' );
-				const billingPhone = document.getElementById( 'phone' );
+				const billingPhone = document.getElementById( 'billing-phone' );
+
 				if ( ! shippingPhone?.value && ! billingPhone?.value ) {
 					return {
 						type: 'error',

tests/bin/install-phpunit-tests-dependencies.sh

@@ -11,6 +11,7 @@ DB_USER=$2
 DB_PASS=$3
 DB_HOST=${4-localhost}
 WP_VERSION=${5-latest}
+PHP_VERSION=$6
 
 TMPDIR=${TMPDIR-/tmp}
 TMPDIR=$(echo $TMPDIR | sed -e "s/\/$//")
@@ -62,9 +63,14 @@ install_wp() {
 }
 
 install_woocommerce() {
-	WC_VERSION=$(curl https://api.wordpress.org/plugins/info/1.0/woocommerce.json | jq -r '.version')
+	if [ $PHP_VERSION = "7.3" ]; then
+		WC_VERSION="8.4.0"
+		echo "Warning: WooCommerce $WC_VERSION is the latest version compatible with PHP7.3"
+	else	
+		WC_VERSION=$(curl https://api.wordpress.org/plugins/info/1.0/woocommerce.json | jq -r '.version')
+	fi
 
-	echo "Installing WooCommerce $WC_VERSION"
+	echo "Installing WooCommerce $WC_VERSION on PHP $PHP_VERSION"
 	cd -
 	download https://downloads.wordpress.org/plugin/woocommerce.$WC_VERSION.zip ../woocommerce.zip
 	unzip -o -qq ../woocommerce.zip -d ../

tests/phpunit/bootstrap.php

@@ -32,7 +32,7 @@
 function _manually_load_plugin() {
 	$_plugin_dir = dirname( __FILE__ ) . '/../../';
 
-	require_once $_plugins_dir . '../woocommerce/woocommerce.php';
+	require_once $_plugin_dir . '../woocommerce/woocommerce.php';
 
 	require_once $_plugin_dir . 'woocommerce-gateway-amazon-payments-advanced.php';
 	require_once $_plugin_dir . 'includes/class-wc-gateway-amazon-payments-advanced-abstract.php';

tests/phpunit/mockers/class-wc-mocker-gateway-amazon-payments-advanced.php

@@ -23,7 +23,7 @@ class WC_Mocker_Gateway_Amazon_Payments_Advanced extends WC_Gateway_Amazon_Payme
 	 *
 	 * @param int|string $order_total The order total to be set.
 	 */
-	public function __construct( int|string $order_total = 50 ) {
+	public function __construct( $order_total = 50 ) {
 		$this->settings = WC_Amazon_Payments_Advanced_API::get_settings();
 
 		self::$order_total = $order_total;