tests

Author: sreichel

.phpstan.dist.baseline.neon

@@ -3096,12 +3096,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php
 
-		-
-			rawMessage: 'Parameter #1 $value of method Mage_Usa_Helper_Data::convertMeasureDimension() expects int|string, float given.'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php
-
 		-
 			rawMessage: Access to an undefined property Mage_Usa_Model_Shipping_Carrier_Fedex::$_defaultGatewayUrl.
 			identifier: property.notFound
@@ -4139,3 +4133,9 @@ parameters:
 			identifier: argument.type
 			count: 1
 			path: lib/Varien/Simplexml/Element.php
+
+		-
+			rawMessage: Dead catch - PhpUnitsOfMeasure\Exception\UnknownUnitOfMeasure is never thrown in the try block.
+			identifier: catch.neverThrown
+			count: 2
+			path: tests/unit/Mage/Usa/Helper/DataTest.php

app/code/core/Mage/Usa/Helper/Data.php

@@ -7,6 +7,8 @@
  * @package    Mage_Usa
  */
 
+use PhpUnitsOfMeasure\Exception\NonNumericValue;
+use PhpUnitsOfMeasure\Exception\NonStringUnitName;
 use PhpUnitsOfMeasure\Exception\UnknownUnitOfMeasure;
 use PhpUnitsOfMeasure\PhysicalQuantity\Mass;
 use PhpUnitsOfMeasure\PhysicalQuantity\Length;
@@ -22,9 +24,11 @@ class Mage_Usa_Helper_Data extends Mage_Core_Helper_Abstract
      * Convert weight in different measure types
      *
      * @param  float $value
-     * @param  string $sourceWeightMeasure
-     * @param  string $toWeightMeasure
+     * @param  Mage_Core_Helper_Measure_Weight::* $sourceWeightMeasure
+     * @param  Mage_Core_Helper_Measure_Weight::* $toWeightMeasure
      * @return null|float
+     * @throws NonNumericValue
+     * @throws NonStringUnitName
      */
     public function convertMeasureWeight($value, $sourceWeightMeasure, $toWeightMeasure)
     {
@@ -40,9 +44,11 @@ public function convertMeasureWeight($value, $sourceWeightMeasure, $toWeightMeas
      * Convert dimensions in different measure types
      *
      * @param  float $value
-     * @param  string $sourceDimensionMeasure
-     * @param  string $toDimensionMeasure
+     * @param  Mage_Core_Helper_Measure_Length::* $sourceDimensionMeasure
+     * @param  Mage_Core_Helper_Measure_Length::* $toDimensionMeasure
      * @return null|float
+     * @throws NonNumericValue
+     * @throws NonStringUnitName
      */
     public function convertMeasureDimension($value, $sourceDimensionMeasure, $toDimensionMeasure)
     {

tests/unit/Mage/Usa/Helper/DataTest.php

@@ -15,6 +15,8 @@
 use Mage_Usa_Helper_Data as Subject;
 use OpenMage\Tests\Unit\OpenMageTest;
 use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Usa\Helper\DataTrait;
+use PhpUnitsOfMeasure\Exception\NonNumericValue;
+use PhpUnitsOfMeasure\Exception\NonStringUnitName;
 use PhpUnitsOfMeasure\Exception\UnknownUnitOfMeasure;
 
 final class DataTest extends OpenMageTest
@@ -33,34 +35,36 @@ public static function setUpBeforeClass(): void
      * @dataProvider provideConvertMeasureWeightData
      * @group Helper
      */
-    public function testConvertMeasureWeight(float $expectedResult, $value, string $sourceWeightMeasure, string $toWeightMeasure): void
+    public function testConvertMeasureWeight(float|string $expectedResult, $value, ?string $sourceWeightMeasure, ?string $toWeightMeasure): void
     {
-        $result = self::$subject->convertMeasureWeight($value, $sourceWeightMeasure, $toWeightMeasure);
-
-        self::assertIsFloat($result);
-        self::assertSame($expectedResult, $result);
+        try {
+            self::assertSame($expectedResult, self::$subject->convertMeasureWeight($value, $sourceWeightMeasure, $toWeightMeasure));
+        } catch (NonNumericValue|NonStringUnitName|UnknownUnitOfMeasure $unitOfMeasure) {
+            self::assertSame($expectedResult, $unitOfMeasure->getMessage());
+        }
     }
 
     /**
      * @dataProvider provideConvertMeasureDimensionData
      * @group Helper
      */
-    public function testConvertMeasureDimension(float $expectedResult, $value, string $sourceWeightMeasure, string $toWeightMeasure): void
+    public function testConvertMeasureDimension(float|string $expectedResult, $value, ?string $sourceWeightMeasure, ?string $toWeightMeasure): void
     {
-        $result = self::$subject->convertMeasureDimension($value, $sourceWeightMeasure, $toWeightMeasure);
-
-        self::assertIsFloat($result);
-        self::assertSame($expectedResult, $result);
+        try {
+            self::assertSame($expectedResult, self::$subject->convertMeasureDimension($value, $sourceWeightMeasure, $toWeightMeasure));
+        } catch (NonNumericValue|NonStringUnitName|UnknownUnitOfMeasure $unitOfMeasure) {
+            self::assertSame($expectedResult, $unitOfMeasure->getMessage());
+        }
     }
 
     /**
      * @dataProvider provideGetMeasureWeightNameData
      * @group Helper
      */
-    public function testGetMeasureWeightName(string $expectedResult, string $eey): void
+    public function testGetMeasureWeightName(string $expectedResult, string $key): void
     {
         try {
-            self::assertSame($expectedResult, self::$subject->getMeasureWeightName($eey));
+            self::assertSame($expectedResult, self::$subject->getMeasureWeightName($key));
         } catch (UnknownUnitOfMeasure $unitOfMeasure) {
             self::assertSame($expectedResult, $unitOfMeasure->getMessage());
         }

tests/unit/Traits/DataProvider/Mage/Usa/Helper/DataTrait.php

@@ -31,6 +31,20 @@ public function provideConvertMeasureWeightData(): Generator
             Mage_Core_Helper_Measure_Weight::OUNCE,
             Mage_Core_Helper_Measure_Weight::POUND,
         ];
+
+        yield 'non-numeric value' => [
+            'Value (xyz) must be numeric.',
+            'xyz',
+            Mage_Core_Helper_Measure_Weight::OUNCE,
+            Mage_Core_Helper_Measure_Weight::POUND,
+        ];
+
+        yield 'non-string unit' => [
+            'Unit name or alias () must be a string value.',
+            10,
+            Mage_Core_Helper_Measure_Weight::OUNCE,
+            null,
+        ];
     }
 
     public function provideConvertMeasureDimensionData(): Generator
@@ -41,6 +55,13 @@ public function provideConvertMeasureDimensionData(): Generator
             Mage_Core_Helper_Measure_Length::STANDARD,
             Mage_Core_Helper_Measure_Length::CENTIMETER,
         ];
+
+        yield 'invalid to cm' => [
+            'Unknown unit of measure (xyz).',
+            10,
+            'xyz',
+            Mage_Core_Helper_Measure_Length::CENTIMETER,
+        ];
     }
 
     public function provideGetMeasureWeightNameData(): Generator