From 5f517620259099adc6eb267055def1c5ad00f9a7 Mon Sep 17 00:00:00 2001 From: Philipp Stracker Date: Thu, 30 Jan 2025 18:22:12 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20More=20appropriate=20hook?= =?UTF-8?q?=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ppcp-applepay/src/ApplepayModule.php | 2 +- modules/ppcp-googlepay/src/GooglepayModule.php | 2 +- modules/ppcp-googlepay/src/Helper/ApmProductStatus.php | 1 - modules/ppcp-settings/src/Endpoint/CommonRestEndpoint.php | 2 +- modules/ppcp-wc-gateway/src/WCGatewayModule.php | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/ppcp-applepay/src/ApplepayModule.php b/modules/ppcp-applepay/src/ApplepayModule.php index dc7b3cf11..ea58b4d89 100644 --- a/modules/ppcp-applepay/src/ApplepayModule.php +++ b/modules/ppcp-applepay/src/ApplepayModule.php @@ -183,7 +183,7 @@ class ApplepayModule implements ServiceModule, ExtendingModule, ExecutableModule ); add_filter( - 'woocommerce_paypal_payments_rest_common_merchant_data', + 'woocommerce_paypal_payments_rest_common_merchant_features', function( array $features ) use ( $c ): array { $product_status = $c->get( 'applepay.apple-product-status' ); assert( $product_status instanceof AppleProductStatus ); diff --git a/modules/ppcp-googlepay/src/GooglepayModule.php b/modules/ppcp-googlepay/src/GooglepayModule.php index dd7320011..a50408bd3 100644 --- a/modules/ppcp-googlepay/src/GooglepayModule.php +++ b/modules/ppcp-googlepay/src/GooglepayModule.php @@ -233,7 +233,7 @@ class GooglepayModule implements ServiceModule, ExtendingModule, ExecutableModul ); add_filter( - 'woocommerce_paypal_payments_rest_common_merchant_data', + 'woocommerce_paypal_payments_rest_common_merchant_features', function ( array $features ) use ( $c ): array { $product_status = $c->get( 'googlepay.helpers.apm-product-status' ); assert( $product_status instanceof ApmProductStatus ); diff --git a/modules/ppcp-googlepay/src/Helper/ApmProductStatus.php b/modules/ppcp-googlepay/src/Helper/ApmProductStatus.php index 1da8379df..dbe812837 100644 --- a/modules/ppcp-googlepay/src/Helper/ApmProductStatus.php +++ b/modules/ppcp-googlepay/src/Helper/ApmProductStatus.php @@ -60,7 +60,6 @@ class ApmProductStatus extends ProductStatus { return $status_override; } - // Check if status was checked on previous requests. if ( $this->settings->has( self::SETTINGS_KEY ) && ( $this->settings->get( self::SETTINGS_KEY ) ) ) { return wc_string_to_bool( $this->settings->get( self::SETTINGS_KEY ) ); } diff --git a/modules/ppcp-settings/src/Endpoint/CommonRestEndpoint.php b/modules/ppcp-settings/src/Endpoint/CommonRestEndpoint.php index 35af6c093..e453a1a87 100644 --- a/modules/ppcp-settings/src/Endpoint/CommonRestEndpoint.php +++ b/modules/ppcp-settings/src/Endpoint/CommonRestEndpoint.php @@ -218,7 +218,7 @@ class CommonRestEndpoint extends RestEndpoint { if ( $this->settings->is_merchant_connected() ) { $extra_data['features'] = apply_filters( - 'woocommerce_paypal_payments_rest_common_merchant_data', + 'woocommerce_paypal_payments_rest_common_merchant_features', array(), ); } diff --git a/modules/ppcp-wc-gateway/src/WCGatewayModule.php b/modules/ppcp-wc-gateway/src/WCGatewayModule.php index 4885bdbf6..fa2c76cc8 100644 --- a/modules/ppcp-wc-gateway/src/WCGatewayModule.php +++ b/modules/ppcp-wc-gateway/src/WCGatewayModule.php @@ -550,7 +550,7 @@ class WCGatewayModule implements ServiceModule, ExtendingModule, ExecutableModul ); add_filter( - 'woocommerce_paypal_payments_rest_common_merchant_data', + 'woocommerce_paypal_payments_rest_common_merchant_features', static function ( array $features ) use ( $c ) : array { try { $billing_agreements_endpoint = $c->get( 'api.endpoint.billing-agreements' );