PES-2422: Update dependencies (#696)

Zasilkovna · Jan 6, 2025 · 51fb8cc · 51fb8cc
2 parents 328d7d5 + 2dc0932
commit 51fb8cc
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 66 deletions.
diff --git a/.ecrc b/.ecrc
@@ -15,7 +15,6 @@
 		"LICENSE$",
 		"^temp\/",
 		"^\\.idea\/",
-		"^.phpunit.result.cache$",
 		"\\.DS_Store$",
 		"\\.phar$"
 	],

diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@
 /log/
 **/.DS_Store
 /tests-coverage/
-/.phpunit.result.cache
 /config/config.local.neon
 /node_modules/
 phpunit.xml
diff --git a/composer.json b/composer.json
@@ -5,18 +5,19 @@
     "require-dev": {
         "composer/composer": "^2.6",
         "wpify/scoper": "3.2.13",
-        "phpunit/phpunit": "10.4.2",
-        "php-stubs/woocommerce-stubs": "^9.3",
+        "phpunit/phpunit": "^10.5",
+        "php-stubs/woocommerce-stubs": "^9.5",
         "editorconfig-checker/editorconfig-checker": "^10.6",
         "slevomat/coding-standard": "^8.15",
         "wp-cli/wp-cli-bundle": "^2.11",
         "phpstan/extension-installer": "^1.4",
         "szepeviktor/phpstan-wordpress": "^2.0",
         "phpstan/phpstan-strict-rules": "^2.0",
-        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan": "^2.1",
         "squizlabs/php_codesniffer": "^3.11",
         "woocommerce/woocommerce-sniffs": "^1.0",
-        "phpstan/phpstan-nette": "^2.0"
+        "phpstan/phpstan-nette": "^2.0",
+        "php-stubs/wordpress-stubs": "^6.7"
     },
     "scripts": {
         "build:deps": "bash build-deps.sh",

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
+<!-- https://docs.phpunit.de/en/10.5/configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
+		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
 		backupGlobals="false"
 		colors="true"
 		displayDetailsOnTestsThatTriggerWarnings="true"
-bootstrap="tests/bootstrap.php"
+		displayDetailsOnPhpunitDeprecations="true"
+		bootstrap="tests/bootstrap.php"
+		cacheResultFile="temp/.phpunit.result.cache"
 >
 	<php>
 		<ini name="error_reporting" value="-1"/>

diff --git a/tests/Module/Checkout/RateCalculatorTest.php b/tests/Module/Checkout/RateCalculatorTest.php
@@ -137,14 +137,14 @@ public static function calculationDataProvider(): array {
 	/**
 	 * @dataProvider calculationDataProvider
 	 */
-	public function testGetShippingRateCost( ?float $expectedCost, Options $carrierOptions, float $totalProductValue, float $cartWeight, bool $isCouponApplied ): void {
+	public function testGetShippingRateCost( ?float $expectedCost, Options $carrierOptions, float $totalProductValue, float $cartWeightKg, bool $isCouponApplied ): void {
 		$this->createRateCalculatorMock();
 
 		$cost = $this->rateCalculator->getShippingRateCost(
 			$carrierOptions,
 			$totalProductValue,
 			$totalProductValue,
-			$cartWeight,
+			$cartWeightKg,
 			$isCouponApplied
 		);
 

diff --git a/tests/Module/Checkout/ShippingRateFactoryTest.php b/tests/Module/Checkout/ShippingRateFactoryTest.php
@@ -116,7 +116,7 @@ public static function rateCreationDataProvider(): array {
 						],
 					'isCarDeliveryEnabled'               => true,
 					'isAgeVerificationRequiredByProduct' => false,
-					'cartWeight'                         => 5.0,
+					'cartWeightKg'                       => 5.0,
 				],
 			'car delivery carrier must not be present in rates' =>
 				[
@@ -162,7 +162,7 @@ public static function rateCreationDataProvider(): array {
 					'allowedCarrierNames'                => null,
 					'isCarDeliveryEnabled'               => false,
 					'isAgeVerificationRequiredByProduct' => false,
-					'cartWeight'                         => 1.0,
+					'cartWeightKg'                       => 1.0,
 				],
 			'only one carrier is active'                   =>
 				[
@@ -208,7 +208,7 @@ public static function rateCreationDataProvider(): array {
 					'allowedCarrierNames'                => null,
 					'isCarDeliveryEnabled'               => true,
 					'isAgeVerificationRequiredByProduct' => false,
-					'cartWeight'                         => 1.0,
+					'cartWeightKg'                       => 1.0,
 				],
 			'carrier not supporting over-weight cart must be omitted' =>
 				[
@@ -242,7 +242,7 @@ public static function rateCreationDataProvider(): array {
 						],
 					'isCarDeliveryEnabled'               => true,
 					'isAgeVerificationRequiredByProduct' => false,
-					'cartWeight'                         => 21.0,
+					'cartWeightKg'                       => 21.0,
 				],
 			'inactive carrier must be omitted'             =>
 				[
@@ -273,7 +273,7 @@ public static function rateCreationDataProvider(): array {
 					'allowedCarrierNames'                => [],
 					'isCarDeliveryEnabled'               => true,
 					'isAgeVerificationRequiredByProduct' => false,
-					'cartWeight'                         => 1.0,
+					'cartWeightKg'                       => 1.0,
 				],
 			'carrier disallowed by product must be omitted' =>
 				[
@@ -302,7 +302,7 @@ public static function rateCreationDataProvider(): array {
 						],
 					'isCarDeliveryEnabled'               => true,
 					'isAgeVerificationRequiredByProduct' => false,
-					'cartWeight'                         => 1.0,
+					'cartWeightKg'                       => 1.0,
 				],
 			'carrier disallowed by product category must be omitted' =>
 				[
@@ -331,7 +331,7 @@ public static function rateCreationDataProvider(): array {
 						],
 					'isCarDeliveryEnabled'               => true,
 					'isAgeVerificationRequiredByProduct' => false,
-					'cartWeight'                         => 1.0,
+					'cartWeightKg'                       => 1.0,
 				],
 			'car delivery carriers must be supported'      =>
 				[
@@ -365,7 +365,7 @@ public static function rateCreationDataProvider(): array {
 						],
 					'isCarDeliveryEnabled'               => true,
 					'isAgeVerificationRequiredByProduct' => false,
-					'cartWeight'                         => 1.0,
+					'cartWeightKg'                       => 1.0,
 				],
 			'carrier not supporting age verification must be omitted' =>
 				[
@@ -399,7 +399,7 @@ public static function rateCreationDataProvider(): array {
 						],
 					'isCarDeliveryEnabled'               => true,
 					'isAgeVerificationRequiredByProduct' => true,
-					'cartWeight'                         => 1.0,
+					'cartWeightKg'                       => 1.0,
 				],
 			'allowed carrier names argument must support null' =>
 				[
@@ -430,7 +430,7 @@ public static function rateCreationDataProvider(): array {
 					'allowedCarrierNames'                => null,
 					'isCarDeliveryEnabled'               => true,
 					'isAgeVerificationRequiredByProduct' => false,
-					'cartWeight'                         => 1.0,
+					'cartWeightKg'                       => 1.0,
 				],
 		];
 	}