fix: move MONEI_MAIN_FILE constant to bootstrap file and fix type hints

jimmyn · jimmyn · commit 953cdabe9f5d · 2025-10-10T09:19:22.000+02:00
1. The MONEI_MAIN_FILE constant was defined in class-woocommerce-gateway-monei.php
   (__FILE__) but WordPress only fires plugin_action_links_{plugin} filter for
   the actual plugin bootstrap file (woocommerce-gateway-monei.php). This caused
   the Settings link to never appear in the WordPress plugins list.

   Fixed by defining MONEI_MAIN_FILE in woocommerce-gateway-monei.php before
   including the class file, so it correctly points to the plugin bootstrap.

2. Fixed PHPStan errors in MoneiAppleGoogleBlocksSupport by changing gateway
   property type from abstract WCMoneiPaymentGateway to concrete
   WCGatewayMoneiAppleGoogle class. This allows PHPStan to recognize the
   isGoogleAvailable() and isAppleAvailable() methods.

Fixes Settings link visibility in WordPress admin.
diff --git a/class-woocommerce-gateway-monei.php b/class-woocommerce-gateway-monei.php
@@ -129,7 +129,7 @@ private function define_constants() {
 			$this->define( 'MONEI_WEB', 'https://monei.com/' );
 			$this->define( 'MONEI_REVIEW', 'https://wordpress.org/support/plugin/monei/reviews/?rate=5#new-post' );
 			$this->define( 'MONEI_SUPPORT', 'https://support.monei.com/' );
-			$this->define( 'MONEI_MAIN_FILE', __FILE__ );
+			// MONEI_MAIN_FILE now defined in woocommerce-gateway-monei.php bootstrap file
 		}
 
 		/**
diff --git a/src/Gateways/Blocks/MoneiAppleGoogleBlocksSupport.php b/src/Gateways/Blocks/MoneiAppleGoogleBlocksSupport.php
@@ -9,23 +9,20 @@
 final class MoneiAppleGoogleBlocksSupport extends AbstractPaymentMethodType {
 
 	protected $name = 'monei_apple_google';
-	/**
-	 * @var WCGatewayMoneiAppleGoogle
-	 */
-	public WCMoneiPaymentGateway $gateway;
+	/** @var WCGatewayMoneiAppleGoogle */
+	public WCGatewayMoneiAppleGoogle $gateway;
 
 	/**
 	 * @param WCGatewayMoneiAppleGoogle $gateway
 	 */
-	public function __construct( WCMoneiPaymentGateway $gateway ) {
+	public function __construct( WCGatewayMoneiAppleGoogle $gateway ) {
 		$this->gateway = $gateway;
 	}
 
 	public function initialize() {
 		$this->settings = get_option( 'woocommerce_monei_apple_google_settings', array() );
 	}
 
-
 	public function is_active() {
 		// Order-pay page always uses classic checkout
 		if ( is_checkout_pay_page() ) {
@@ -43,7 +40,6 @@ public function is_active() {
 		return 'yes' === ( $this->get_setting( 'enabled' ) ?? 'no' );
 	}
 
-
 	public function get_payment_method_script_handles() {
 		// Order-pay page uses classic checkout, not blocks
 		if ( is_checkout_pay_page() ) {
@@ -88,7 +84,6 @@ public function get_payment_method_script_handles() {
 		return array( $script_name );
 	}
 
-
 	public function get_payment_method_data() {
 		$supports              = $this->gateway->supports;
 		$total                 = WC()->cart !== null ? WC()->cart->get_total( false ) : 0;
@@ -120,7 +115,6 @@ public function get_payment_method_data() {
 			'logoGoogle'          => $isGoogleEnabled ? $logoGoogle : false,
 			'logoApple'           => $isAppleEnabled ? $logoApple : false,
 			'supports'            => $supports,
-
 			// yes: test mode.
 			// no:  live,
 			'testMode'            => $this->gateway->getTestmode(),
diff --git a/woocommerce-gateway-monei.php b/woocommerce-gateway-monei.php
@@ -85,6 +85,9 @@ function delete_payment_methods_transients_on_update($upgrader_object, $options)
 
 add_action('upgrader_process_complete', 'delete_payment_methods_transients_on_update', 10, 2);
 
+// Define main plugin file constant for plugin_action_links filter
+define( 'MONEI_MAIN_FILE', __FILE__ );
+
 require_once 'class-woocommerce-gateway-monei.php';
 function WC_Monei() {
     return Woocommerce_Gateway_Monei::instance();

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ private function define_constants() {`
`129`	`129`	`$this->define( 'MONEI_WEB', 'https://monei.com/' );`
`130`	`130`	`$this->define( 'MONEI_REVIEW', 'https://wordpress.org/support/plugin/monei/reviews/?rate=5#new-post' );`
`131`	`131`	`$this->define( 'MONEI_SUPPORT', 'https://support.monei.com/' );`
`132`		`- $this->define( 'MONEI_MAIN_FILE', __FILE__ );`
	`132`	`+ // MONEI_MAIN_FILE now defined in woocommerce-gateway-monei.php bootstrap file`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`/**`