From 199883a05a477900d8993710d420fc51ef3caafc Mon Sep 17 00:00:00 2001
From: Vladimir Reznichenko <kalessil@gmail.com>
Date: Mon, 9 Sep 2024 10:37:30 +0200
Subject: [PATCH] [dev] PSR-4 naming fixes in tests (part 1) (#51194)

In this PR we address PSR-4 naming-related violations (class FQN vs path mismatches and co) in tests.
---
 .../changelog/dev-psr4-naming-fixes           |  4 +++
 .../tests/php/src/Blocks/Domain/Package.php   |  6 ++---
 .../Domain/Services/DeleteDraftOrders.php     |  9 ++++---
 .../src/Blocks/Domain/Services/Hydration.php  |  3 ++-
 .../tests/php/src/Caching/OrderCacheTest.php  |  3 +++
 .../src/Database/BlockHooksVersionTests.php   |  6 ++++-
 .../PostsToOrdersMigrationControllerTest.php  | 12 ++++-----
 .../Internal/Admin/Orders/EditLockTest.php    |  5 +++-
 .../Orders/DataSynchronizerTests.php          | 10 +++++--
 .../Orders/LegacyDataCleanupTests.php         |  6 ++++-
 .../Orders/LegacyDataHandlerTests.php         |  7 +++--
 ...ableDataStoreRestOrdersControllerTests.php |  5 ++++
 .../Orders/OrdersTableDataStoreTests.php      | 27 +++++++++++++++----
 .../Orders/OrdersTableQueryTests.php          |  8 ++++--
 .../OrdersTableRefundDataStoreTests.php       | 10 ++++---
 .../src/Internal/Orders/IppFunctionsTest.php  |  2 --
 .../Orders/MobileMessagingHandlerTest.php     |  5 ++++
 .../Traits/AccessiblePrivateMethodsTest.php   |  5 ++--
 .../TransientFilesEngineTest.php              |  5 ++--
 .../Utilities/COTMigrationUtilTest.php        |  8 +++---
 .../Internal/Utilities/DatabaseUtilTest.php   |  8 +++---
 .../Internal/Utilities/HtmlSanitizerTest.php  |  8 +++---
 22 files changed, 112 insertions(+), 50 deletions(-)
 create mode 100644 plugins/woocommerce/changelog/dev-psr4-naming-fixes

diff --git a/plugins/woocommerce/changelog/dev-psr4-naming-fixes b/plugins/woocommerce/changelog/dev-psr4-naming-fixes
new file mode 100644
index 00000000000..4cecf347663
--- /dev/null
+++ b/plugins/woocommerce/changelog/dev-psr4-naming-fixes
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Coding standatds: fix PSR-4 naming violation in tests (part 1).
diff --git a/plugins/woocommerce/tests/php/src/Blocks/Domain/Package.php b/plugins/woocommerce/tests/php/src/Blocks/Domain/Package.php
index 0849bb289b6..5befc6c5729 100644
--- a/plugins/woocommerce/tests/php/src/Blocks/Domain/Package.php
+++ b/plugins/woocommerce/tests/php/src/Blocks/Domain/Package.php
@@ -1,8 +1,8 @@
 <?php
+declare( strict_types = 1 );
 
-namespace Automattic\WooCommerce\Tests\Blocks\Domain\Package;
+namespace Automattic\WooCommerce\Tests\Blocks\Domain;
 
-use \WP_UnitTestCase;
 use Automattic\WooCommerce\Blocks\Domain\Package as TestedPackage;
 use Automattic\WooCommerce\Blocks\Domain\Services\FeatureGating;
 
@@ -11,7 +11,7 @@ use Automattic\WooCommerce\Blocks\Domain\Services\FeatureGating;
  *
  * @since $VID:$
  */
-class Package extends WP_UnitTestCase {
+class Package extends \WP_UnitTestCase {
 
 	private function get_package() {
 		return new TestedPackage( '1.0.0', __DIR__, new FeatureGating() );
diff --git a/plugins/woocommerce/tests/php/src/Blocks/Domain/Services/DeleteDraftOrders.php b/plugins/woocommerce/tests/php/src/Blocks/Domain/Services/DeleteDraftOrders.php
index 9eec288224c..562ed3aafd9 100644
--- a/plugins/woocommerce/tests/php/src/Blocks/Domain/Services/DeleteDraftOrders.php
+++ b/plugins/woocommerce/tests/php/src/Blocks/Domain/Services/DeleteDraftOrders.php
@@ -1,12 +1,13 @@
 <?php
+declare( strict_types = 1 );
 
-namespace Automattic\WooCommerce\Tests\Blocks\Library;
+namespace Automattic\WooCommerce\Tests\Blocks\Domain\Services;
 
-use Yoast\PHPUnitPolyfills\TestCases\TestCase;
-use \WC_Order;
+use Automattic\WooCommerce\Blocks\Domain\Package;
 use Automattic\WooCommerce\Blocks\Domain\Services\DraftOrders;
 use Automattic\WooCommerce\Blocks\Domain\Services\FeatureGating;
-use Automattic\WooCommerce\Blocks\Domain\Package;
+use WC_Order;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
  * Tests Delete Draft Orders functionality
diff --git a/plugins/woocommerce/tests/php/src/Blocks/Domain/Services/Hydration.php b/plugins/woocommerce/tests/php/src/Blocks/Domain/Services/Hydration.php
index b48922b98dc..ef09561db19 100644
--- a/plugins/woocommerce/tests/php/src/Blocks/Domain/Services/Hydration.php
+++ b/plugins/woocommerce/tests/php/src/Blocks/Domain/Services/Hydration.php
@@ -1,6 +1,7 @@
 <?php
+declare( strict_types = 1 );
 
-namespace Automattic\WooCommerce\Tests\Blocks\Library;
+namespace Automattic\WooCommerce\Tests\Blocks\Domain\Services;
 
 use Automattic\WooCommerce\Blocks\Package;
 use Yoast\PHPUnitPolyfills\TestCases\TestCase;
diff --git a/plugins/woocommerce/tests/php/src/Caching/OrderCacheTest.php b/plugins/woocommerce/tests/php/src/Caching/OrderCacheTest.php
index cd165a223a3..dfe5af900d7 100644
--- a/plugins/woocommerce/tests/php/src/Caching/OrderCacheTest.php
+++ b/plugins/woocommerce/tests/php/src/Caching/OrderCacheTest.php
@@ -1,4 +1,7 @@
 <?php
+declare( strict_types = 1);
+
+namespace Automattic\WooCommerce\Tests\Caching;
 
 use Automattic\WooCommerce\Caches\OrderCache;
 use Automattic\WooCommerce\Internal\DataStores\Orders\OrdersTableDataStore;
diff --git a/plugins/woocommerce/tests/php/src/Database/BlockHooksVersionTests.php b/plugins/woocommerce/tests/php/src/Database/BlockHooksVersionTests.php
index d26c457b032..ddf6eb54384 100644
--- a/plugins/woocommerce/tests/php/src/Database/BlockHooksVersionTests.php
+++ b/plugins/woocommerce/tests/php/src/Database/BlockHooksVersionTests.php
@@ -1,10 +1,14 @@
 <?php
 declare( strict_types = 1 );
 
+namespace Automattic\WooCommerce\Tests\Database;
+
+use WC_Install;
+
 /**
  * Tests for the block hooks versioning we set in the DB.
  */
-class BlockHooksVersionTests extends WC_Unit_Test_Case {
+class BlockHooksVersionTests extends \WC_Unit_Test_Case {
 	/**
 	 * Option name for storing the block hooks version.
 	 *
diff --git a/plugins/woocommerce/tests/php/src/Database/Migrations/CustomOrderTable/PostsToOrdersMigrationControllerTest.php b/plugins/woocommerce/tests/php/src/Database/Migrations/CustomOrderTable/PostsToOrdersMigrationControllerTest.php
index 6cf594ca1af..8ae7be66965 100644
--- a/plugins/woocommerce/tests/php/src/Database/Migrations/CustomOrderTable/PostsToOrdersMigrationControllerTest.php
+++ b/plugins/woocommerce/tests/php/src/Database/Migrations/CustomOrderTable/PostsToOrdersMigrationControllerTest.php
@@ -1,20 +1,20 @@
 <?php
-/**
- * Tests for PostsToOrdersMigrationController class.
- */
+declare( strict_types = 1 );
+
+namespace Automattic\WooCommerce\Tests\Database\Migrations\CustomOrderTable;
 
 use Automattic\WooCommerce\Database\Migrations\CustomOrderTable\PostsToOrdersMigrationController;
 use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
 use Automattic\WooCommerce\Internal\DataStores\Orders\OrdersTableDataStore;
 use Automattic\WooCommerce\RestApi\UnitTests\Helpers\OrderHelper;
 use Automattic\WooCommerce\Testing\Tools\DynamicDecorator;
-use Automattic\WooCommerce\Testing\Tools\ReplacementObject;
 use Automattic\WooCommerce\Utilities\StringUtil;
+use WC_DateTime;
 
 /**
  * Class PostsToOrdersMigrationControllerTest.
  */
-class PostsToOrdersMigrationControllerTest extends WC_Unit_Test_Case {
+class PostsToOrdersMigrationControllerTest extends \WC_Unit_Test_Case {
 
 	/**
 	 * @var PostsToOrdersMigrationController
@@ -669,7 +669,7 @@ WHERE order_id = {$order_id} AND meta_key = 'non_unique_key_1' AND meta_value in
 	/**
 	 * Configure a dynamic decorator for $wpdb that logs (and optionally errors) any db related transaction query.
 	 *
-	 * @param string|\Exception\bool $transaction_fails False if the transaction related queries won't fail, 'error' if they produce a db error, or an Exception object that they will throw.
+	 * @param string|\Exception|bool $transaction_fails False if the transaction related queries won't fail, 'error' if they produce a db error, or an Exception object that they will throw.
 	 * @return DynamicDecorator
 	 */
 	private function use_wpdb_mock( $transaction_fails = false ) {
diff --git a/plugins/woocommerce/tests/php/src/Internal/Admin/Orders/EditLockTest.php b/plugins/woocommerce/tests/php/src/Internal/Admin/Orders/EditLockTest.php
index 38a6f3fe6ec..525a61e8f82 100644
--- a/plugins/woocommerce/tests/php/src/Internal/Admin/Orders/EditLockTest.php
+++ b/plugins/woocommerce/tests/php/src/Internal/Admin/Orders/EditLockTest.php
@@ -1,4 +1,7 @@
 <?php
+declare( strict_types = 1);
+
+namespace Automattic\WooCommerce\Tests\Internal\Admin\Orders;
 
 use Automattic\WooCommerce\Internal\Admin\Orders\EditLock;
 use Automattic\WooCommerce\RestApi\UnitTests\HPOSToggleTrait;
@@ -6,7 +9,7 @@ use Automattic\WooCommerce\RestApi\UnitTests\HPOSToggleTrait;
 /**
  * Tests related to order edit locking in admin.
  */
-class EditLockTest extends WC_Unit_Test_Case {
+class EditLockTest extends \WC_Unit_Test_Case {
 	use HPOSToggleTrait;
 
 	/**
diff --git a/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/DataSynchronizerTests.php b/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/DataSynchronizerTests.php
index 489b18671d8..be4c6f0fc0d 100644
--- a/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/DataSynchronizerTests.php
+++ b/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/DataSynchronizerTests.php
@@ -1,4 +1,7 @@
 <?php
+declare( strict_types = 1 );
+
+namespace Automattic\WooCommerce\Tests\Internal\DataStores\Orders;
 
 use Automattic\WooCommerce\Internal\BatchProcessing\BatchProcessingController;
 use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
@@ -7,11 +10,14 @@ use Automattic\WooCommerce\Internal\DataStores\Orders\OrdersTableDataStore;
 use Automattic\WooCommerce\RestApi\UnitTests\Helpers\OrderHelper;
 use Automattic\WooCommerce\RestApi\UnitTests\HPOSToggleTrait;
 use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
+use ReflectionClass;
+use WC_Data_Store;
+use WC_Order;
 
 /**
  * Tests for DataSynchronizer class.
  */
-class DataSynchronizerTests extends HposTestCase {
+class DataSynchronizerTests extends \HposTestCase {
 	use ArraySubsetAsserts;
 	use HPOSToggleTrait;
 
@@ -141,7 +147,7 @@ class DataSynchronizerTests extends HposTestCase {
 
 		$post_order = OrderHelper::create_order();
 		$this->assertInstanceOf(
-			WP_Post::class,
+			\WP_Post::class,
 			get_post( $post_order->get_id() ),
 			'The order was initially created as a post.'
 		);
diff --git a/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/LegacyDataCleanupTests.php b/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/LegacyDataCleanupTests.php
index b8b4df5bef5..c8b730bf5b0 100644
--- a/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/LegacyDataCleanupTests.php
+++ b/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/LegacyDataCleanupTests.php
@@ -1,4 +1,8 @@
 <?php
+declare( strict_types = 1 );
+
+namespace Automattic\WooCommerce\Tests\Internal\DataStores\Orders;
+
 use Automattic\WooCommerce\Internal\BatchProcessing\BatchProcessingController;
 use Automattic\WooCommerce\Internal\DataStores\Orders\DataSynchronizer;
 use Automattic\WooCommerce\Internal\DataStores\Orders\LegacyDataCleanup;
@@ -7,7 +11,7 @@ use Automattic\WooCommerce\RestApi\UnitTests\HPOSToggleTrait;
 /**
  * Tests for the {@see LegacyDataCleanup} class.
  */
-class LegacyDataCleanupTests extends WC_Unit_Test_Case {
+class LegacyDataCleanupTests extends \WC_Unit_Test_Case {
 	use HPOSToggleTrait;
 
 	/**
diff --git a/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/LegacyDataHandlerTests.php b/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/LegacyDataHandlerTests.php
index 9e4aec22efa..9213ac43d4d 100644
--- a/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/LegacyDataHandlerTests.php
+++ b/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/LegacyDataHandlerTests.php
@@ -1,14 +1,17 @@
 <?php
+declare( strict_types = 1 );
+
+namespace Automattic\WooCommerce\Tests\Internal\DataStores\Orders;
 
 use Automattic\WooCommerce\Internal\DataStores\Orders\DataSynchronizer;
-use Automattic\WooCommerce\RestApi\UnitTests\HPOSToggleTrait;
 use Automattic\WooCommerce\Internal\DataStores\Orders\LegacyDataHandler;
 use Automattic\WooCommerce\RestApi\UnitTests\Helpers\OrderHelper;
+use Automattic\WooCommerce\RestApi\UnitTests\HPOSToggleTrait;
 
 /**
  * Class OrdersTableQueryTests.
  */
-class LegacyDataHandlerTests extends WC_Unit_Test_Case {
+class LegacyDataHandlerTests extends \WC_Unit_Test_Case {
 	use HPOSToggleTrait;
 
 	/**
diff --git a/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/OrdersTableDataStoreRestOrdersControllerTests.php b/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/OrdersTableDataStoreRestOrdersControllerTests.php
index 23d7d0cfb29..b4edfd6573c 100644
--- a/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/OrdersTableDataStoreRestOrdersControllerTests.php
+++ b/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/OrdersTableDataStoreRestOrdersControllerTests.php
@@ -1,10 +1,15 @@
 <?php
+declare( strict_types = 1 );
+
+namespace Automattic\WooCommerce\Tests\Internal\DataStores\Orders;
+
 use Automattic\WooCommerce\Database\Migrations\CustomOrderTable\PostsToOrdersMigrationController;
 use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
 use Automattic\WooCommerce\Internal\DataStores\Orders\OrdersTableDataStore;
 use Automattic\WooCommerce\Internal\Features\FeaturesController;
 use Automattic\WooCommerce\RestApi\UnitTests\Helpers\OrderHelper;
 use Automattic\WooCommerce\Utilities\ArrayUtil as ArrayUtilAlias;
+use WC_Data_Store;
 
 if ( ! class_exists( 'WC_REST_Orders_Controller_Tests' ) ) {
 	require_once dirname( __FILE__, 5 ) . '/includes/rest-api/Controllers/Version3/class-wc-rest-orders-controller-tests.php';
diff --git a/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/OrdersTableDataStoreTests.php b/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/OrdersTableDataStoreTests.php
index b60fa042994..ea8ec764c7a 100644
--- a/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/OrdersTableDataStoreTests.php
+++ b/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/OrdersTableDataStoreTests.php
@@ -1,4 +1,7 @@
 <?php
+declare( strict_types = 1 );
+
+namespace Automattic\WooCommerce\Tests\Internal\DataStores\Orders;
 
 use Automattic\WooCommerce\Database\Migrations\CustomOrderTable\PostsToOrdersMigrationController;
 use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
@@ -8,13 +11,27 @@ use Automattic\WooCommerce\Internal\DataStores\Orders\OrdersTableQuery;
 use Automattic\WooCommerce\RestApi\UnitTests\Helpers\OrderHelper;
 use Automattic\WooCommerce\RestApi\UnitTests\HPOSToggleTrait;
 use Automattic\WooCommerce\Utilities\OrderUtil;
+use DateTime;
+use DateTimeZone;
+use WC_Helper_Order;
+use WC_Helper_Payment_Token;
+use WC_Helper_Product;
+use WC_Order;
+use WC_Order_Data_Store_CPT;
+use WC_Order_Item_Product;
+use WC_Order_Item_Shipping;
+use WC_Product;
+use WC_Product_Simple;
+use WC_Shipping_Rate;
+use WC_Tax;
+use WC_Tests_Webhook_Functions;
 
 /**
  * Class OrdersTableDataStoreTests.
  *
  * Test for OrdersTableDataStore class.
  */
-class OrdersTableDataStoreTests extends HposTestCase {
+class OrdersTableDataStoreTests extends \HposTestCase {
 	use HPOSToggleTrait;
 
 	/**
@@ -2962,8 +2979,8 @@ class OrdersTableDataStoreTests extends HposTestCase {
 			'total'                        => '25.00000000',
 			'customer_id'                  => $order->get_customer_id(),
 			'billing_email'                => $order->get_billing_email(),
-			'date_created'                 => gmdate( 'Y-m-d H:i:s', $order->get_date_created()->format( 'U' ) ),
-			'date_modified'                => gmdate( 'Y-m-d H:i:s', $order->get_date_modified()->format( 'U' ) ),
+			'date_created'                 => gmdate( 'Y-m-d H:i:s', (int) $order->get_date_created()->format( 'U' ) ),
+			'date_modified'                => gmdate( 'Y-m-d H:i:s', (int) $order->get_date_modified()->format( 'U' ) ),
 			'parent_id'                    => $order->get_parent_id(),
 			'payment_method'               => $order->get_payment_method(),
 			'payment_method_title'         => $order->get_payment_method_title(),
@@ -3000,8 +3017,8 @@ class OrdersTableDataStoreTests extends HposTestCase {
 			'new_order_email_sent'         => $order->get_new_order_email_sent(),
 			'order_key'                    => $order->get_order_key(),
 			'order_stock_reduced'          => $order->get_order_stock_reduced(),
-			'date_paid'                    => gmdate( 'Y-m-d H:i:s', $order->get_date_paid()->format( 'U' ) ),
-			'date_completed'               => gmdate( 'Y-m-d H:i:s', $order->get_date_completed()->format( 'U' ) ),
+			'date_paid'                    => gmdate( 'Y-m-d H:i:s', (int) $order->get_date_paid()->format( 'U' ) ),
+			'date_completed'               => gmdate( 'Y-m-d H:i:s', (int) $order->get_date_completed()->format( 'U' ) ),
 			'shipping_tax'                 => '12.34000000',
 			'shipping_total'               => '123.45000000',
 			'discount_tax'                 => '2.11100000',
diff --git a/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/OrdersTableQueryTests.php b/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/OrdersTableQueryTests.php
index 083555da0b1..ec3f79607e8 100644
--- a/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/OrdersTableQueryTests.php
+++ b/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/OrdersTableQueryTests.php
@@ -1,15 +1,19 @@
 <?php
+declare( strict_types = 1 );
+
+namespace Automattic\WooCommerce\Tests\Internal\DataStores\Orders;
 
-use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
 use Automattic\WooCommerce\Internal\DataStores\Orders\OrdersTableQuery;
 use Automattic\WooCommerce\RestApi\UnitTests\Helpers\OrderHelper;
 use Automattic\WooCommerce\RestApi\UnitTests\HPOSToggleTrait;
 use Automattic\WooCommerce\Utilities\OrderUtil;
+use WC_Helper_Product;
+use WC_Order;
 
 /**
  * Class OrdersTableQueryTests.
  */
-class OrdersTableQueryTests extends WC_Unit_Test_Case {
+class OrdersTableQueryTests extends \WC_Unit_Test_Case {
 	use HPOSToggleTrait;
 
 	/**
diff --git a/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/OrdersTableRefundDataStoreTests.php b/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/OrdersTableRefundDataStoreTests.php
index a1f00ed0fd7..27fbe0291ce 100644
--- a/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/OrdersTableRefundDataStoreTests.php
+++ b/plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/OrdersTableRefundDataStoreTests.php
@@ -1,17 +1,19 @@
 <?php
-/**
- * File containing the class WP_Test_WC_Order_Refund.
- */
+declare( strict_types = 1 );
+
+namespace Automattic\WooCommerce\Tests\Internal\DataStores\Orders;
 
 use Automattic\WooCommerce\Database\Migrations\CustomOrderTable\PostsToOrdersMigrationController;
 use Automattic\WooCommerce\Internal\DataStores\Orders\OrdersTableDataStore;
 use Automattic\WooCommerce\Internal\DataStores\Orders\OrdersTableRefundDataStore;
 use Automattic\WooCommerce\RestApi\UnitTests\Helpers\OrderHelper;
+use WC_Order_Refund;
+use WC_Order_Refund_Data_Store_CPT;
 
 /**
  * Class OrdersTableRefundDataStoreTests.
  */
-class OrdersTableRefundDataStoreTests extends WC_Unit_Test_Case {
+class OrdersTableRefundDataStoreTests extends \WC_Unit_Test_Case {
 	use \Automattic\WooCommerce\RestApi\UnitTests\HPOSToggleTrait;
 
 	/**
diff --git a/plugins/woocommerce/tests/php/src/Internal/Orders/IppFunctionsTest.php b/plugins/woocommerce/tests/php/src/Internal/Orders/IppFunctionsTest.php
index 819d7163154..a566ba578a6 100644
--- a/plugins/woocommerce/tests/php/src/Internal/Orders/IppFunctionsTest.php
+++ b/plugins/woocommerce/tests/php/src/Internal/Orders/IppFunctionsTest.php
@@ -3,8 +3,6 @@
 namespace Automattic\WooCommerce\Tests\Internal\Orders;
 
 use Automattic\WooCommerce\Internal\Orders\IppFunctions;
-use MobileMessagingHandlerTest;
-
 
 /**
  * Tests for IppFunctions.
diff --git a/plugins/woocommerce/tests/php/src/Internal/Orders/MobileMessagingHandlerTest.php b/plugins/woocommerce/tests/php/src/Internal/Orders/MobileMessagingHandlerTest.php
index 8c814234152..d5004103b8e 100644
--- a/plugins/woocommerce/tests/php/src/Internal/Orders/MobileMessagingHandlerTest.php
+++ b/plugins/woocommerce/tests/php/src/Internal/Orders/MobileMessagingHandlerTest.php
@@ -1,6 +1,11 @@
 <?php
+declare( strict_types = 1);
+
+namespace Automattic\WooCommerce\Tests\Internal\Orders;
 
 use Automattic\WooCommerce\Internal\Orders\MobileMessagingHandler;
+use DateTime;
+use WC_Order;
 
 /**
  * Tests for MobileMessagingHandler.
diff --git a/plugins/woocommerce/tests/php/src/Internal/Traits/AccessiblePrivateMethodsTest.php b/plugins/woocommerce/tests/php/src/Internal/Traits/AccessiblePrivateMethodsTest.php
index 31679b6ac25..52b7c730f73 100644
--- a/plugins/woocommerce/tests/php/src/Internal/Traits/AccessiblePrivateMethodsTest.php
+++ b/plugins/woocommerce/tests/php/src/Internal/Traits/AccessiblePrivateMethodsTest.php
@@ -1,4 +1,5 @@
 <?php
+declare( strict_types = 1 );
 
 namespace Automattic\WooCommerce\Tests\Internal\Traits;
 
@@ -429,7 +430,7 @@ class AccessiblePrivateMethodsTest extends \WC_Unit_Test_Case {
 	}
 }
 
-//phpcs:disable Generic.Files.OneObjectStructurePerFile.MultipleFound, Squiz.Classes.ClassFileName.NoMatch
+//phpcs:disable Generic.Files.OneObjectStructurePerFile.MultipleFound, Squiz.Classes.ClassFileName.NoMatch, Suin.Classes.PSR4
 /**
  * Class used in the inherited __call method test.
  */
@@ -449,4 +450,4 @@ class BaseClass {
 	//phpcs:enable Squiz.Commenting.FunctionComment.Missing
 }
 
-//phpcs:enable Generic.Files.OneObjectStructurePerFile.MultipleFound, Squiz.Classes.ClassFileName.NoMatch
+//phpcs:enable Generic.Files.OneObjectStructurePerFile.MultipleFound, Squiz.Classes.ClassFileName.NoMatch, Suin.Classes.PSR4
diff --git a/plugins/woocommerce/tests/php/src/Internal/TransientFiles/TransientFilesEngineTest.php b/plugins/woocommerce/tests/php/src/Internal/TransientFiles/TransientFilesEngineTest.php
index d774074fdec..b3869c2df83 100644
--- a/plugins/woocommerce/tests/php/src/Internal/TransientFiles/TransientFilesEngineTest.php
+++ b/plugins/woocommerce/tests/php/src/Internal/TransientFiles/TransientFilesEngineTest.php
@@ -1,6 +1,7 @@
 <?php
+declare( strict_types = 1 );
 
-namespace Automattic\WooCommerce\Tests\Internal;
+namespace Automattic\WooCommerce\Tests\Internal\TransientFiles;
 
 use Automattic\WooCommerce\Internal\TransientFiles\TransientFilesEngine;
 
@@ -262,7 +263,7 @@ class TransientFilesEngineTest extends \WC_REST_Unit_Test_Case {
 		$fake_wp_filesystem = new class() {
 			public $created_files = array();
 
-			public function put_contents( string $file, string $contents, $mode = false ): bool {
+			public function put_contents( string $file, string $contents, $mode = false ): int {
 				$this->created_files[ $file ] = $contents;
 				return strlen( $contents );
 			}
diff --git a/plugins/woocommerce/tests/php/src/Internal/Utilities/COTMigrationUtilTest.php b/plugins/woocommerce/tests/php/src/Internal/Utilities/COTMigrationUtilTest.php
index 50b98ee8ada..e6efb0c3469 100644
--- a/plugins/woocommerce/tests/php/src/Internal/Utilities/COTMigrationUtilTest.php
+++ b/plugins/woocommerce/tests/php/src/Internal/Utilities/COTMigrationUtilTest.php
@@ -1,7 +1,7 @@
 <?php
-/**
- * Tests for COTMigration utility.
- */
+declare( strict_types = 1 );
+
+namespace Automattic\WooCommerce\Tests\Internal\Utilities;
 
 use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
 use Automattic\WooCommerce\Internal\DataStores\Orders\DataSynchronizer;
@@ -11,7 +11,7 @@ use Automattic\WooCommerce\RestApi\UnitTests\Helpers\OrderHelper;
 /**
  * Tests for COTMigration utility.
  */
-class COTMigrationUtilTest extends WC_Unit_Test_Case {
+class COTMigrationUtilTest extends \WC_Unit_Test_Case {
 
 	/**
 	 * @var COTMigrationUtil
diff --git a/plugins/woocommerce/tests/php/src/Internal/Utilities/DatabaseUtilTest.php b/plugins/woocommerce/tests/php/src/Internal/Utilities/DatabaseUtilTest.php
index 0ec880e92fc..6f98bac9163 100644
--- a/plugins/woocommerce/tests/php/src/Internal/Utilities/DatabaseUtilTest.php
+++ b/plugins/woocommerce/tests/php/src/Internal/Utilities/DatabaseUtilTest.php
@@ -1,7 +1,7 @@
 <?php
-/**
- * Tests for the DatabaseUtil utility.
- */
+declare( strict_types = 1 );
+
+namespace Automattic\WooCommerce\Tests\Internal\Utilities;
 
 use Automattic\WooCommerce\Internal\DataStores\Orders\DataSynchronizer;
 use Automattic\WooCommerce\Internal\Utilities\DatabaseUtil;
@@ -9,7 +9,7 @@ use Automattic\WooCommerce\Internal\Utilities\DatabaseUtil;
 /**
  * Tests relating to DatabaseUtil.
  */
-class DatabaseUtilTest extends WC_Unit_Test_Case {
+class DatabaseUtilTest extends \WC_Unit_Test_Case {
 
 	/**
 	 * @var DatabaseUtil
diff --git a/plugins/woocommerce/tests/php/src/Internal/Utilities/HtmlSanitizerTest.php b/plugins/woocommerce/tests/php/src/Internal/Utilities/HtmlSanitizerTest.php
index 77a2b8571f2..c259dfd784f 100644
--- a/plugins/woocommerce/tests/php/src/Internal/Utilities/HtmlSanitizerTest.php
+++ b/plugins/woocommerce/tests/php/src/Internal/Utilities/HtmlSanitizerTest.php
@@ -1,14 +1,14 @@
 <?php
-/**
- * Tests for the HtmlSanitizer utility.
- */
+declare( strict_types = 1 );
+
+namespace Automattic\WooCommerce\Tests\Internal\Utilities;
 
 use Automattic\WooCommerce\Internal\Utilities\HtmlSanitizer;
 
 /**
  * Tests relating to HtmlSanitizer.
  */
-class HtmlSanitizerTest extends WC_Unit_Test_Case {
+class HtmlSanitizerTest extends \WC_Unit_Test_Case {
 	/**
 	 * @var HtmlSanitizer
 	 */