Fix WC_Payment_Gateway being accessed too early (#4099)

* Fiex WC_Payment_Gateway being accessed too early

* Fix doc

* Upgrade deps

Author: davidbarratt

composer.lock

@@ -2,7 +2,7 @@
 /**
  * Plugin Name:      Flex HSA/FSA Payments
  * Description:      Accept HSA/FSA payments directly in the checkout flow.
- * Version:          3.1.9
+ * Version:          3.1.10
  * Plugin URI:       https://wordpress.org/plugins/pay-with-flex/
  * Author:           Flex
  * Author URI:       https://withflex.com/
@@ -18,6 +18,7 @@
 
 namespace Flex;
 
+use Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry;
 use Automattic\WooCommerce\Enums\ProductType;
 use Flex\Controller\OrderController;
 use Flex\Controller\WebhookController;
@@ -820,23 +821,29 @@ function add_option_wc_flex_settings( string $option, mixed $value ): void {
 );
 
 /**
- * Add the Payment Gateway.
+ * Register the Payment Gateway.
  *
  * @param string[] $methods An array of Payment method classes.
  */
+function wc_payment_gateways( array $methods = array() ): array {
+	return array( ...$methods, PaymentGateway::class );
+}
 add_filter(
 	hook_name: 'woocommerce_payment_gateways',
-	callback: array( PaymentGateway::class, 'wc_payment_gateways' ),
+	callback: __NAMESPACE__ . '\wc_payment_gateways',
 );
 
 /**
- * Add the Payment Method.
+ * Register the payment method.
  *
- * @param string[] $methods An array of Payment method classes.
+ * @param PaymentMethodRegistry $payment_method_registry The WooCommerce payment method registry.
  */
+function wc_blocks_payment_method_type_registration( PaymentMethodRegistry $payment_method_registry ) {
+	$payment_method_registry->register( new PaymentMethod() );
+}
 add_filter(
 	hook_name: 'woocommerce_blocks_payment_method_type_registration',
-	callback: array( PaymentMethod::class, 'wc_blocks_payment_method_type_registration' ),
+	callback: __NAMESPACE__ . '\wc_blocks_payment_method_type_registration',
 );
 
 /**

pay-with-flex.php

@@ -3,7 +3,7 @@ Contributors: withflex, davidbarratt
 Tags: hsa, fsa, payments, woocommerce
 Requires at least: 6.8
 Tested up to: 6.8
-Stable tag: 3.1.9
+Stable tag: 3.1.10
 Requires PHP: 8.1
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -55,6 +55,9 @@ Flex makes this process simple by offering asynchronous telehealth visits direct
 
 == Changelog ==
 
+= 3.1.10 =
+* Fixed an error where WC_Payment_Gateway was accessed too early.
+
 = 3.1.9 =
 * Fixed version inconsistency between the plugin file and the readme.
 

readme.txt

@@ -90,15 +90,6 @@ public function init() {
 		$this->init_form_fields();
 	}
 
-	/**
-	 * Register this class as a Payment Gateway.
-	 *
-	 * @param string[] $methods An array of Payment method classes.
-	 */
-	public static function wc_payment_gateways( array $methods = array() ): array {
-		return array( ...$methods, self::class );
-	}
-
 	/**
 	 * {@inheritdoc}
 	 *

src/PaymentGateway.php

@@ -10,7 +10,6 @@
 namespace Flex;
 
 use Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType;
-use Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry;
 
 /**
  * Flex Payment Method.
@@ -24,15 +23,6 @@ class PaymentMethod extends AbstractPaymentMethodType {
 	 */
 	protected $name = 'flex';
 
-	/**
-	 * Register the payment method.
-	 *
-	 * @param PaymentMethodRegistry $payment_method_registry The WooCommerce payment method registry.
-	 */
-	public static function wc_blocks_payment_method_type_registration( PaymentMethodRegistry $payment_method_registry ) {
-		$payment_method_registry->register( new self() );
-	}
-
 	/**
 	 * {@inheritdoc}
 	 */