From 4a7c7517a769cc375083f76c2a19b3ff9b237dd9 Mon Sep 17 00:00:00 2001 From: Philipp Stracker Date: Thu, 9 Jan 2025 13:05:03 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20CommonSettings=20to=20G?= =?UTF-8?q?eneralSettings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ppcp-compat/services.php | 6 +++--- modules/ppcp-settings/services.php | 10 +++++----- .../Data/{CommonSettings.php => GeneralSettings.php} | 6 +++--- .../ppcp-settings/src/Endpoint/CommonRestEndpoint.php | 10 +++++----- .../src/Service/AuthenticationManager.php | 10 +++++----- 5 files changed, 21 insertions(+), 21 deletions(-) rename modules/ppcp-settings/src/Data/{CommonSettings.php => GeneralSettings.php} (98%) diff --git a/modules/ppcp-compat/services.php b/modules/ppcp-compat/services.php index 9c92a28b3..7982366e0 100644 --- a/modules/ppcp-compat/services.php +++ b/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 diff --git a/modules/ppcp-settings/services.php b/modules/ppcp-settings/services.php index da2ef14b3..5824aec03 100644 --- a/modules/ppcp-settings/services.php +++ b/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' ), diff --git a/modules/ppcp-settings/src/Data/CommonSettings.php b/modules/ppcp-settings/src/Data/GeneralSettings.php similarity index 98% rename from modules/ppcp-settings/src/Data/CommonSettings.php rename to modules/ppcp-settings/src/Data/GeneralSettings.php index 8e118ab89..fa0e653a1 100644 --- a/modules/ppcp-settings/src/Data/CommonSettings.php +++ b/modules/ppcp-settings/src/Data/GeneralSettings.php @@ -1,6 +1,6 @@ settings = $settings; } diff --git a/modules/ppcp-settings/src/Service/AuthenticationManager.php b/modules/ppcp-settings/src/Service/AuthenticationManager.php index 4b3f18786..8c11182a7 100644 --- a/modules/ppcp-settings/src/Service/AuthenticationManager.php +++ b/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,