Merge pull request #2547 from woocommerce/PCP-3577-fatal-error-in-log…

…s-when-we-try-to-pay-with-apple-pay-as-separate-gateway Fatal error in logs when we try to pay with Apple Pay as separate gateway (3577)
woocommerce · Aug 29, 2024 · 796ded0 · 796ded0
2 parents f751eb2 + 888d912
commit 796ded0
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/modules/ppcp-applepay/services.php b/modules/ppcp-applepay/services.php
@@ -306,7 +306,8 @@ static function( ContainerInterface $container ): AppleProductStatus {
 			$container->get( 'wcgateway.processor.refunds' ),
 			$container->get( 'wcgateway.transaction-url-provider' ),
 			$container->get( 'session.handler' ),
-			$container->get( 'applepay.url' )
+			$container->get( 'applepay.url' ),
+			$container->get( 'woocommerce.logger.woocommerce' )
 		);
 	},
 

diff --git a/modules/ppcp-applepay/src/ApplePayGateway.php b/modules/ppcp-applepay/src/ApplePayGateway.php
@@ -10,6 +10,7 @@
 namespace WooCommerce\PayPalCommerce\Applepay;
 
 use Exception;
+use Psr\Log\LoggerInterface;
 use WC_Order;
 use WC_Payment_Gateway;
 use WooCommerce\PayPalCommerce\Session\SessionHandler;
@@ -72,6 +73,13 @@ class ApplePayGateway extends WC_Payment_Gateway {
 	 */
 	private $module_url;
 
+	/**
+	 * The logger.
+	 *
+	 * @var LoggerInterface
+	 */
+	private $logger;
+
 	/**
 	 * ApplePayGateway constructor.
 	 *
@@ -84,14 +92,16 @@ class ApplePayGateway extends WC_Payment_Gateway {
 	 *                                                             view URL based on order.
 	 * @param SessionHandler          $session_handler             The Session Handler.
 	 * @param string                  $module_url                  The URL to the module.
+	 * @param LoggerInterface         $logger The logger.
 	 */
 	public function __construct(
 		OrderProcessor $order_processor,
 		callable $paypal_checkout_url_factory,
 		RefundProcessor $refund_processor,
 		TransactionUrlProvider $transaction_url_provider,
 		SessionHandler $session_handler,
-		string $module_url
+		string $module_url,
+		LoggerInterface $logger
 	) {
 		$this->id = self::ID;
 
@@ -111,6 +121,7 @@ public function __construct(
 		$this->refund_processor            = $refund_processor;
 		$this->transaction_url_provider    = $transaction_url_provider;
 		$this->session_handler             = $session_handler;
+		$this->logger                      = $logger;
 
 		add_action(
 			'woocommerce_update_options_payment_gateways_' . $this->id,

diff --git a/modules/ppcp-googlepay/services.php b/modules/ppcp-googlepay/services.php
@@ -267,7 +267,8 @@ static function( ContainerInterface $container ): ApmProductStatus {
 			$container->get( 'wcgateway.processor.refunds' ),
 			$container->get( 'wcgateway.transaction-url-provider' ),
 			$container->get( 'session.handler' ),
-			$container->get( 'googlepay.url' )
+			$container->get( 'googlepay.url' ),
+			$container->get( 'woocommerce.logger.woocommerce' )
 		);
 	},
 );
diff --git a/modules/ppcp-googlepay/src/GooglePayGateway.php b/modules/ppcp-googlepay/src/GooglePayGateway.php
@@ -10,6 +10,7 @@
 namespace WooCommerce\PayPalCommerce\Googlepay;
 
 use Exception;
+use Psr\Log\LoggerInterface;
 use WC_Order;
 use WC_Payment_Gateway;
 use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
@@ -72,6 +73,13 @@ class GooglePayGateway extends WC_Payment_Gateway {
 	 */
 	private $module_url;
 
+	/**
+	 * The logger.
+	 *
+	 * @var LoggerInterface
+	 */
+	private $logger;
+
 	/**
 	 * GooglePayGateway constructor.
 	 *
@@ -81,14 +89,16 @@ class GooglePayGateway extends WC_Payment_Gateway {
 	 * @param TransactionUrlProvider  $transaction_url_provider Service providing transaction view URL based on order.
 	 * @param SessionHandler          $session_handler The Session Handler.
 	 * @param string                  $module_url The URL to the module.
+	 * @param LoggerInterface         $logger The logger.
 	 */
 	public function __construct(
 		OrderProcessor $order_processor,
 		callable $paypal_checkout_url_factory,
 		RefundProcessor $refund_processor,
 		TransactionUrlProvider $transaction_url_provider,
 		SessionHandler $session_handler,
-		string $module_url
+		string $module_url,
+		LoggerInterface $logger
 	) {
 		$this->id = self::ID;
 
@@ -113,6 +123,7 @@ public function __construct(
 		$this->refund_processor            = $refund_processor;
 		$this->transaction_url_provider    = $transaction_url_provider;
 		$this->session_handler             = $session_handler;
+		$this->logger                      = $logger;
 
 		add_action(
 			'woocommerce_update_options_payment_gateways_' . $this->id,