🚚 Rename CommonSettings to GeneralSettings

modules/ppcp-compat/services.php

@@ -129,16 +129,16 @@ return array(
 
 		return array(
 			new SettingsMap(
-				$container->get( 'settings.data.common' ),
+				$container->get( 'settings.data.general' ),
 				array(
 					'client_id'     => 'client_id',
 					'client_secret' => 'client_secret',
 				)
 			),
 			new SettingsMap(
-				$container->get( 'settings.data.common' ),
+				$container->get( 'settings.data.general' ),
 				/**
-				 * The new CommonSettings class stores the current connection
+				 * The new GeneralSettings class stores the current connection
 				 * details, without adding an environment-suffix (no `_sandbox`
 				 * or `_production` in the field name)
 				 * Only the `sandbox_merchant` flag indicates, which environment

modules/ppcp-settings/services.php

@@ -11,7 +11,7 @@ namespace WooCommerce\PayPalCommerce\Settings;
 
 use WooCommerce\PayPalCommerce\ApiClient\Helper\Cache;
 use WooCommerce\PayPalCommerce\Settings\Ajax\SwitchSettingsUiEndpoint;
-use WooCommerce\PayPalCommerce\Settings\Data\CommonSettings;
+use WooCommerce\PayPalCommerce\Settings\Data\GeneralSettings;
 use WooCommerce\PayPalCommerce\Settings\Data\OnboardingProfile;
 use WooCommerce\PayPalCommerce\Settings\Endpoint\AuthenticationRestEndpoint;
 use WooCommerce\PayPalCommerce\Settings\Endpoint\CommonRestEndpoint;
@@ -57,8 +57,8 @@ return array(
 			$can_use_subscriptions
 		);
 	},
-	'settings.data.common'                        => static function ( ContainerInterface $container ) : CommonSettings {
-		return new CommonSettings(
+	'settings.data.general'                       => static function ( ContainerInterface $container ) : GeneralSettings {
+		return new GeneralSettings(
 			$container->get( 'api.shop.country' ),
 			$container->get( 'api.shop.currency.getter' )->get(),
 		);
@@ -67,7 +67,7 @@ return array(
 		return new OnboardingRestEndpoint( $container->get( 'settings.data.onboarding' ) );
 	},
 	'settings.rest.common'                        => static function ( ContainerInterface $container ) : CommonRestEndpoint {
-		return new CommonRestEndpoint( $container->get( 'settings.data.common' ) );
+		return new CommonRestEndpoint( $container->get( 'settings.data.general' ) );
 	},
 	'settings.rest.refresh_feature_status'        => static function ( ContainerInterface $container ) : RefreshFeatureStatusEndpoint {
 		return new RefreshFeatureStatusEndpoint(
@@ -178,7 +178,7 @@ return array(
 	},
 	'settings.service.authentication_manager'     => static function ( ContainerInterface $container ) : AuthenticationManager {
 		return new AuthenticationManager(
-			$container->get( 'settings.data.common' ),
+			$container->get( 'settings.data.general' ),
 			$container->get( 'api.env.paypal-host' ),
 			$container->get( 'api.env.endpoint.login-seller' ),
 			$container->get( 'api.repository.partner-referrals-data' ),

modules/ppcp-settings/src/Data/GeneralSettings.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Common settings class
+ * General plugin settings class
  *
  * @package WooCommerce\PayPalCommerce\Settings\Data
  */
@@ -13,7 +13,7 @@ use RuntimeException;
 use WooCommerce\PayPalCommerce\Settings\DTO\MerchantConnectionDTO;
 
 /**
- * Class CommonSettings
+ * Class GeneralSettings
  *
  * This class serves as a container for managing the common settings that
  * are used and managed in various areas of the settings UI
@@ -21,7 +21,7 @@ use WooCommerce\PayPalCommerce\Settings\DTO\MerchantConnectionDTO;
  * Those settings mainly describe connection details and are initially collected
  * in the onboarding wizard, and also appear in the settings screen.
  */
-class CommonSettings extends AbstractDataModel {
+class GeneralSettings extends AbstractDataModel {
 
 	/**
 	 * Option key where profile details are stored.

modules/ppcp-settings/src/Endpoint/CommonRestEndpoint.php

@@ -12,7 +12,7 @@ namespace WooCommerce\PayPalCommerce\Settings\Endpoint;
 use WP_REST_Server;
 use WP_REST_Response;
 use WP_REST_Request;
-use WooCommerce\PayPalCommerce\Settings\Data\CommonSettings;
+use WooCommerce\PayPalCommerce\Settings\Data\GeneralSettings;
 
 /**
  * REST controller for "common" settings, which are used and modified by
@@ -32,9 +32,9 @@ class CommonRestEndpoint extends RestEndpoint {
 	/**
 	 * The settings instance.
 	 *
-	 * @var CommonSettings
+	 * @var GeneralSettings
 	 */
-	protected CommonSettings $settings;
+	protected GeneralSettings $settings;
 
 	/**
 	 * Field mapping for request to profile transformation.
@@ -98,9 +98,9 @@ class CommonRestEndpoint extends RestEndpoint {
 	/**
 	 * Constructor.
 	 *
-	 * @param CommonSettings $settings The settings instance.
+	 * @param GeneralSettings $settings The settings instance.
 	 */
-	public function __construct( CommonSettings $settings ) {
+	public function __construct( GeneralSettings $settings ) {
 		$this->settings = $settings;
 	}
 

modules/ppcp-settings/src/Service/AuthenticationManager.php

@@ -18,7 +18,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Endpoint\LoginSeller;
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\Orders;
 use WooCommerce\PayPalCommerce\ApiClient\Helper\InMemoryCache;
 use WooCommerce\PayPalCommerce\ApiClient\Repository\PartnerReferralsData;
-use WooCommerce\PayPalCommerce\Settings\Data\CommonSettings;
+use WooCommerce\PayPalCommerce\Settings\Data\GeneralSettings;
 use WooCommerce\PayPalCommerce\WcGateway\Helper\EnvironmentConfig;
 use WooCommerce\WooCommerce\Logging\Logger\NullLogger;
 use WooCommerce\PayPalCommerce\Settings\DTO\MerchantConnectionDTO;
@@ -30,9 +30,9 @@ class AuthenticationManager {
 	/**
 	 * Data model that stores the connection details.
 	 *
-	 * @var CommonSettings
+	 * @var GeneralSettings
 	 */
-	private CommonSettings $common_settings;
+	private GeneralSettings $common_settings;
 
 	/**
 	 * Logging instance.
@@ -65,14 +65,14 @@ class AuthenticationManager {
 	/**
 	 * Constructor.
 	 *
-	 * @param CommonSettings       $common_settings Data model that stores the connection details.
+	 * @param GeneralSettings      $common_settings Data model that stores the connection details.
 	 * @param EnvironmentConfig    $connection_host API host for direct authentication.
 	 * @param EnvironmentConfig    $login_endpoint  API handler to fetch merchant credentials.
 	 * @param PartnerReferralsData $referrals_data  Partner referrals data.
 	 * @param ?LoggerInterface     $logger          Logging instance.
 	 */
 	public function __construct(
-		CommonSettings $common_settings,
+		GeneralSettings $common_settings,
 		EnvironmentConfig $connection_host,
 		EnvironmentConfig $login_endpoint,
 		PartnerReferralsData $referrals_data,