♻️ Remove ContextTrait duplication, use existing Context class via callable

Author: danieldudzic

modules/ppcp-button/src/Helper/ContextTrait.php

@@ -11,7 +11,6 @@
 
 use WooCommerce\PayPalCommerce\ApiClient\Entity\ExperienceContext;
 use WooCommerce\PayPalCommerce\ApiClient\Helper\PurchaseUnitSanitizer;
-use WooCommerce\PayPalCommerce\Button\Helper\ContextTrait;
 
 /**
  * A map of old to new styling settings.
@@ -21,8 +20,6 @@
  */
 class SettingsTabMapHelper {
 
-	use ContextTrait;
-
 	/**
 	 * A map of new to old 3d secure values.
 	 *

modules/ppcp-compat/src/Settings/SettingsTabMapHelper.php

@@ -11,7 +11,6 @@
 
 use RuntimeException;
 use WooCommerce\PayPalCommerce\Applepay\ApplePayGateway;
-use WooCommerce\PayPalCommerce\Button\Helper\ContextTrait;
 use WooCommerce\PayPalCommerce\Googlepay\GooglePayGateway;
 use WooCommerce\PayPalCommerce\Settings\Data\AbstractDataModel;
 use WooCommerce\PayPalCommerce\Settings\Data\PaymentSettings;
@@ -25,8 +24,6 @@
  */
 class StylingSettingsMapHelper {
 
-	use ContextTrait;
-
 	protected const BUTTON_NAMES = array( GooglePayGateway::ID, ApplePayGateway::ID );
 
 	/**
@@ -45,6 +42,15 @@ public function __construct( callable $context_provider ) {
 		$this->context_provider = $context_provider;
 	}
 
+	/**
+	 * Returns the current context string.
+	 *
+	 * @return string
+	 */
+	private function context(): string {
+		return ( $this->context_provider )();
+	}
+
 	/**
 	 * Maps old setting keys to new setting style names.
 	 *