Rearrange multi-currency backend directory structure (#9387)

Automattic · Sep 6, 2024 · b2bb412 · b2bb412
1 parent f28eebf
commit b2bb412
Show file tree

Hide file tree

Showing 45 changed files with 481 additions and 483 deletions.
diff --git a/composer.json b/composer.json
@@ -88,7 +88,7 @@
     },
     "autoload": {
         "psr-4": {
-            "WCPay\\MultiCurrency\\": "includes/multi-currency",
+            "WCPay\\MultiCurrency\\": "multi-currency/src",
             "WCPay\\Vendor\\": "lib/packages",
             "WCPay\\": "src"
         },

diff --git a/includes/class-wc-payments.php b/includes/class-wc-payments.php
@@ -491,8 +491,8 @@ public static function init() {
 		include_once __DIR__ . '/class-duplicate-payment-prevention-service.php';
 		include_once __DIR__ . '/class-wc-payments-incentives-service.php';
 		include_once __DIR__ . '/class-compatibility-service.php';
-		include_once __DIR__ . '/multi-currency/wc-payments-multi-currency.php';
-		include_once __DIR__ . '/class-wc-payments-currency-manager.php';
+		include_once __DIR__ . '/compat/multi-currency/wc-payments-multi-currency.php';
+		include_once __DIR__ . '/compat/multi-currency/class-wc-payments-currency-manager.php';
 		include_once __DIR__ . '/class-duplicates-detection-service.php';
 
 		self::$woopay_checkout_service = new Checkout_Service();

diff --git a/...es/class-wc-payments-currency-manager.php → ...cy/class-wc-payments-currency-manager.php b/...es/class-wc-payments-currency-manager.php → ...cy/class-wc-payments-currency-manager.php
diff --git a/...i-currency/wc-payments-multi-currency.php → ...i-currency/wc-payments-multi-currency.php b/...i-currency/wc-payments-multi-currency.php → ...i-currency/wc-payments-multi-currency.php
diff --git a/includes/multi-currency/AdminNotices.php → multi-currency/src/AdminNotices.php b/includes/multi-currency/AdminNotices.php → multi-currency/src/AdminNotices.php
diff --git a/includes/multi-currency/Analytics.php → multi-currency/src/Analytics.php b/includes/multi-currency/Analytics.php → multi-currency/src/Analytics.php
diff --git a/...udes/multi-currency/BackendCurrencies.php → multi-currency/src/BackendCurrencies.php b/...udes/multi-currency/BackendCurrencies.php → multi-currency/src/BackendCurrencies.php
diff --git a/includes/multi-currency/Compatibility.php → multi-currency/src/Compatibility.php b/includes/multi-currency/Compatibility.php → multi-currency/src/Compatibility.php
@@ -7,8 +7,6 @@
 
 namespace WCPay\MultiCurrency;
 
-use WC_Deposits;
-use WC_Deposits_Product_Manager;
 use WC_Order;
 use WC_Order_Refund;
 use WCPay\MultiCurrency\Compatibility\BaseCompatibility;
@@ -41,7 +39,7 @@ class Compatibility extends BaseCompatibility {
 	 *
 	 * @return void
 	 */
-	protected function init() {
+	public function init() {
 		add_action( 'init', [ $this, 'init_compatibility_classes' ], 11 );
 
 		if ( defined( 'DOING_CRON' ) ) {

diff --git a/...rency/Compatibility/BaseCompatibility.php → ...y/src/Compatibility/BaseCompatibility.php b/...rency/Compatibility/BaseCompatibility.php → ...y/src/Compatibility/BaseCompatibility.php
@@ -46,5 +46,5 @@ public function __construct( MultiCurrency $multi_currency, Utils $utils ) {
 	 *
 	 * @return void
 	 */
-	abstract protected function init();
+	abstract public function init();
 }
diff --git a/...ncy/Compatibility/WooCommerceBookings.php → ...src/Compatibility/WooCommerceBookings.php b/...ncy/Compatibility/WooCommerceBookings.php → ...src/Compatibility/WooCommerceBookings.php
@@ -39,7 +39,7 @@ public function __construct( MultiCurrency $multi_currency, Utils $utils, Fronte
 	 *
 	 * @return void
 	 */
-	protected function init() {
+	public function init() {
 		// Add needed actions and filters if Bookings is active.
 		if ( class_exists( 'WC_Bookings' ) ) {
 			if ( ! is_admin() || wp_doing_ajax() ) {

diff --git a/...ncy/Compatibility/WooCommerceDeposits.php → ...src/Compatibility/WooCommerceDeposits.php b/...ncy/Compatibility/WooCommerceDeposits.php → ...src/Compatibility/WooCommerceDeposits.php
@@ -20,7 +20,7 @@ class WooCommerceDeposits extends BaseCompatibility {
 	 *
 	 * @return void
 	 */
-	protected function init() {
+	public function init() {
 		if ( class_exists( 'WC_Deposits' ) ) {
 			/*
 			 * Multi-currency support was added to WooCommerce Deposits in version 2.0.1.

diff --git a/...rrency/Compatibility/WooCommerceFedEx.php → ...cy/src/Compatibility/WooCommerceFedEx.php b/...rrency/Compatibility/WooCommerceFedEx.php → ...cy/src/Compatibility/WooCommerceFedEx.php
@@ -20,7 +20,7 @@ class WooCommerceFedEx extends BaseCompatibility {
 	 *
 	 * @return void
 	 */
-	protected function init() {
+	public function init() {
 		// Add needed actions and filters if FedEx is active.
 		if ( class_exists( 'WC_Shipping_Fedex_Init' ) ) {
 			add_filter( MultiCurrency::FILTER_PREFIX . 'should_return_store_currency', [ $this, 'should_return_store_currency' ] );

diff --git a/...ompatibility/WooCommerceNameYourPrice.php → ...ompatibility/WooCommerceNameYourPrice.php b/...ompatibility/WooCommerceNameYourPrice.php → ...ompatibility/WooCommerceNameYourPrice.php
@@ -21,7 +21,7 @@ class WooCommerceNameYourPrice extends BaseCompatibility {
 	 *
 	 * @return  void
 	 */
-	protected function init() {
+	public function init() {
 		// Add needed actions and filters if Name Your Price is active.
 		if ( class_exists( 'WC_Name_Your_Price' ) ) {
 			// Convert meta prices.

diff --git a/...atibility/WooCommercePointsAndRewards.php → ...atibility/WooCommercePointsAndRewards.php b/...atibility/WooCommercePointsAndRewards.php → ...atibility/WooCommercePointsAndRewards.php
@@ -33,7 +33,7 @@ class WooCommercePointsAndRewards extends BaseCompatibility {
 	 *
 	 * @return  void
 	 */
-	protected function init() {
+	public function init() {
 		// Add needed filters if Points & Rewards is active and it's not an admin request.
 		if ( is_admin() || ! class_exists( 'WC_Points_Rewards' ) ) {
 			return;

diff --git a/...cy/Compatibility/WooCommercePreOrders.php → ...rc/Compatibility/WooCommercePreOrders.php b/...cy/Compatibility/WooCommercePreOrders.php → ...rc/Compatibility/WooCommercePreOrders.php
@@ -20,7 +20,7 @@ class WooCommercePreOrders extends BaseCompatibility {
 	 *
 	 * @return  void
 	 */
-	protected function init() {
+	public function init() {
 		// Add needed actions and filters if Pre-Orders is active.
 		if ( class_exists( 'WC_Pre_Orders' ) ) {
 			add_filter( 'wc_pre_orders_fee', [ $this, 'wc_pre_orders_fee' ] );

diff --git a/...ompatibility/WooCommerceProductAddOns.php → ...ompatibility/WooCommerceProductAddOns.php b/...ompatibility/WooCommerceProductAddOns.php → ...ompatibility/WooCommerceProductAddOns.php
@@ -23,7 +23,7 @@ class WooCommerceProductAddOns extends BaseCompatibility {
 	 *
 	 * @return  void
 	 */
-	protected function init() {
+	public function init() {
 		// Add needed actions and filters if Product Add Ons is active.
 		if ( class_exists( 'WC_Product_Addons' ) ) {
 			if ( ! is_admin() && ! defined( 'DOING_CRON' ) ) {

diff --git a/...ompatibility/WooCommerceSubscriptions.php → ...ompatibility/WooCommerceSubscriptions.php b/...ompatibility/WooCommerceSubscriptions.php → ...ompatibility/WooCommerceSubscriptions.php
@@ -59,7 +59,7 @@ class WooCommerceSubscriptions extends BaseCompatibility {
 	 *
 	 * @return  void
 	 */
-	protected function init() {
+	public function init() {
 		// Add needed actions and filters if WC Subscriptions or WCPay Subscriptions are active.
 		if ( class_exists( 'WC_Subscriptions' ) || class_exists( 'WC_Payments_Subscriptions' ) ) {
 			if ( ! is_admin() && ! defined( 'DOING_CRON' ) ) {

diff --git a/...currency/Compatibility/WooCommerceUPS.php → ...ency/src/Compatibility/WooCommerceUPS.php b/...currency/Compatibility/WooCommerceUPS.php → ...ency/src/Compatibility/WooCommerceUPS.php
@@ -20,7 +20,7 @@ class WooCommerceUPS extends BaseCompatibility {
 	 *
 	 * @return  void
 	 */
-	protected function init() {
+	public function init() {
 		// Add needed actions and filters if UPS is active.
 		if ( class_exists( 'WC_Shipping_UPS_Init' ) ) {
 			add_filter( MultiCurrency::FILTER_PREFIX . 'should_return_store_currency', [ $this, 'should_return_store_currency' ] );

diff --git a/includes/multi-currency/CountryFlags.php → multi-currency/src/CountryFlags.php b/includes/multi-currency/CountryFlags.php → multi-currency/src/CountryFlags.php
diff --git a/includes/multi-currency/Currency.php → multi-currency/src/Currency.php b/includes/multi-currency/Currency.php → multi-currency/src/Currency.php
diff --git a/.../multi-currency/CurrencySwitcherBlock.php → multi-currency/src/CurrencySwitcherBlock.php b/.../multi-currency/CurrencySwitcherBlock.php → multi-currency/src/CurrencySwitcherBlock.php
diff --git a/...multi-currency/CurrencySwitcherWidget.php → ...i-currency/src/CurrencySwitcherWidget.php b/...multi-currency/CurrencySwitcherWidget.php → ...i-currency/src/CurrencySwitcherWidget.php
diff --git a/...y/Exceptions/InvalidCurrencyException.php → ...c/Exceptions/InvalidCurrencyException.php b/...y/Exceptions/InvalidCurrencyException.php → ...c/Exceptions/InvalidCurrencyException.php
diff --git a/...ceptions/InvalidCurrencyRateException.php → ...ceptions/InvalidCurrencyRateException.php b/...ceptions/InvalidCurrencyRateException.php → ...ceptions/InvalidCurrencyRateException.php
diff --git a/...des/multi-currency/FrontendCurrencies.php → multi-currency/src/FrontendCurrencies.php b/...des/multi-currency/FrontendCurrencies.php → multi-currency/src/FrontendCurrencies.php
diff --git a/includes/multi-currency/FrontendPrices.php → multi-currency/src/FrontendPrices.php b/includes/multi-currency/FrontendPrices.php → multi-currency/src/FrontendPrices.php
diff --git a/includes/multi-currency/Geolocation.php → multi-currency/src/Geolocation.php b/includes/multi-currency/Geolocation.php → multi-currency/src/Geolocation.php
diff --git a/...multi-currency/Helpers/OrderMetaHelper.md → ...i-currency/src/Helpers/OrderMetaHelper.md b/...multi-currency/Helpers/OrderMetaHelper.md → ...i-currency/src/Helpers/OrderMetaHelper.md
diff --git a/...ulti-currency/Helpers/OrderMetaHelper.php → ...-currency/src/Helpers/OrderMetaHelper.php b/...ulti-currency/Helpers/OrderMetaHelper.php → ...-currency/src/Helpers/OrderMetaHelper.php
diff --git a/...erfaces/MultiCurrencyAccountInterface.php → ...erfaces/MultiCurrencyAccountInterface.php b/...erfaces/MultiCurrencyAccountInterface.php → ...erfaces/MultiCurrencyAccountInterface.php
diff --git a/...faces/MultiCurrencyApiClientInterface.php → ...faces/MultiCurrencyApiClientInterface.php b/...faces/MultiCurrencyApiClientInterface.php → ...faces/MultiCurrencyApiClientInterface.php
diff --git a/...nterfaces/MultiCurrencyCacheInterface.php → ...nterfaces/MultiCurrencyCacheInterface.php b/...nterfaces/MultiCurrencyCacheInterface.php → ...nterfaces/MultiCurrencyCacheInterface.php
diff --git a/...es/MultiCurrencyLocalizationInterface.php → ...es/MultiCurrencyLocalizationInterface.php b/...es/MultiCurrencyLocalizationInterface.php → ...es/MultiCurrencyLocalizationInterface.php
diff --git a/includes/multi-currency/Logger.php → multi-currency/src/Logger.php b/includes/multi-currency/Logger.php → multi-currency/src/Logger.php
@@ -12,18 +12,18 @@
  */
 class Logger {
 
+	/**
+	 * Log source identifier.
+	 */
+	const LOG_FILE = 'woopayments-multi-currency';
+
 	/**
 	 * The WooCommerce logger instance.
 	 *
 	 * @var \WC_Logger|null
 	 */
 	private $logger;
 
-	/**
-	 * Log source identifier.
-	 */
-	const LOG_FILE = 'woopayments-multi-currency';
-
 	/**
 	 * Log a debug message.
 	 *