Fix inconsistent instance of AppleProductStatus

woocommerce · Feb 2, 2024 · 42f3e57 · 42f3e57
1 parent 6e78c87
commit 42f3e57
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/modules/ppcp-applepay/services.php b/modules/ppcp-applepay/services.php
@@ -18,6 +18,7 @@
 use WooCommerce\PayPalCommerce\Applepay\Assets\PropertiesDictionary;
 use WooCommerce\PayPalCommerce\Applepay\Helper\ApmApplies;
 use WooCommerce\PayPalCommerce\Applepay\Helper\AvailabilityNotice;
+use WooCommerce\PayPalCommerce\Common\Pattern\SingletonDecorator;
 use WooCommerce\PayPalCommerce\Onboarding\Environment;
 use WooCommerce\PayPalCommerce\Onboarding\State;
 use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
@@ -72,14 +73,16 @@
 		return $settings->has( 'applepay_validated' ) ? $settings->get( 'applepay_validated' ) === true : false;
 	},
 
-	'applepay.apple-product-status'              => static function( ContainerInterface $container ): AppleProductStatus {
-		return new AppleProductStatus(
-			$container->get( 'wcgateway.settings' ),
-			$container->get( 'api.endpoint.partners' ),
-			$container->get( 'onboarding.state' ),
-			$container->get( 'api.helper.failure-registry' )
-		);
-	},
+	'applepay.apple-product-status'              => SingletonDecorator::make(
+		static function( ContainerInterface $container ): AppleProductStatus {
+			return new AppleProductStatus(
+				$container->get( 'wcgateway.settings' ),
+				$container->get( 'api.endpoint.partners' ),
+				$container->get( 'onboarding.state' ),
+				$container->get( 'api.helper.failure-registry' )
+			);
+		}
+	),
 	'applepay.available'                         => static function ( ContainerInterface $container ): bool {
 		if ( apply_filters( 'woocommerce_paypal_payments_applepay_validate_product_status', true ) ) {
 			$status = $container->get( 'applepay.apple-product-status' );

diff --git a/modules/ppcp-wc-gateway/src/Settings/SettingsListener.php b/modules/ppcp-wc-gateway/src/Settings/SettingsListener.php
@@ -346,9 +346,10 @@ private function onboarding_redirect( bool $success = true ): void {
 	/**
 	 * Prevent enabling both Pay Later messaging and PayPal vaulting
 	 *
+	 * @return void
 	 * @throws RuntimeException When API request fails.
 	 */
-	public function listen_for_vaulting_enabled() {
+	public function listen_for_vaulting_enabled(): void {
 		if ( ! $this->is_valid_site_request() || State::STATE_ONBOARDED !== $this->state->current_state() ) {
 			return;
 		}