Merge pull request #8908 from magento-gl/UPS_AC11811_29APR

Hammer:: Platform Health Scope

Author: internal-magento-queue-manager[bot]

app/code/Magento/Ups/Model/Carrier.php

@@ -432,6 +432,19 @@ public function setRequest(RateRequest $request)
             $unit = $this->getConfigData('unit_of_measure');
         }
         $rowRequest->setUnitMeasure($unit);
+
+        $rowRequest->setPackageHeight($request->getPackageHeight());
+        $rowRequest->setPackageWidth($request->getPackageWidth());
+        $rowRequest->setPackageDepth($request->getPackageDepth());
+
+        if ($rowRequest->getUnitMeasure() == 'KGS') {
+            $rowRequest->setUnitDimensions('CM');
+            $rowRequest->setUnitDimensionsDescription('Centimeter');
+        } else {
+            $rowRequest->setUnitDimensions('IN');
+            $rowRequest->setUnitDimensionsDescription('Inches');
+        }
+
         $rowRequest->setIsReturn($request->getIsReturn());
         $rowRequest->setBaseSubtotalInclTax($request->getBaseSubtotalInclTax());
 
@@ -1134,6 +1147,10 @@ protected function _getRestQuotes()
             $rateParams['RateRequest']['Shipment']['Service']['Description'] = $serviceDescription;
         }
 
+        $height = $rowRequest->getPackageHeight() ?? 0;
+        $width = $rowRequest->getPackageWidth() ?? 0;
+        $length = $rowRequest->getPackageDepth() ?? 0;
+
         foreach ($rowRequest->getPackages() as $package) {
             $rateParams['RateRequest']['Shipment']['Package'][] = [
                 "PackagingType" => [
@@ -1142,12 +1159,12 @@ protected function _getRestQuotes()
                 ],
                 "Dimensions" => [
                     "UnitOfMeasurement" => [
-                        "Code" => "IN",
-                        "Description" => "Inches"
+                        "Code" => "{$rowRequest->getUnitDimensions()}",
+                        "Description" => "{$rowRequest->getUnitDimensionsDescription()}"
                     ],
-                    "Length" => "5",
-                    "Width" => "5",
-                    "Height" => "5"
+                    "Length" => "{$length}",
+                    "Width" => "{$width}",
+                    "Height" => "{$height}"
                 ],
                 "PackageWeight" => [
                     "UnitOfMeasurement" => [

dev/tests/integration/testsuite/Magento/GraphQl/App/GraphQlCheckoutMutationsStateTest.php

@@ -39,7 +39,7 @@ protected function setUp(): void
             $this->markTestSkipped('GraphQlStateDiff class is not available on this version of Magento.');
         }
 
-        $this->graphQlStateDiff = new GraphQlStateDiff($this);
+        $this->graphQlStateDiff = new GraphQlStateDiff();
         parent::setUp();
     }
 

dev/tests/integration/testsuite/Magento/GraphQl/App/GraphQlCustomerMutationsTest.php

@@ -36,7 +36,7 @@ protected function setUp(): void
             $this->markTestSkipped('GraphQlStateDiff class is not available on this version of Magento.');
         }
 
-        $this->graphQlStateDiff = new GraphQlStateDiff($this);
+        $this->graphQlStateDiff = new GraphQlStateDiff();
         parent::setUp();
     }
 

dev/tests/integration/testsuite/Magento/GraphQl/App/GraphQlStateTest.php

@@ -39,7 +39,7 @@ protected function setUp(): void
             $this->markTestSkipped('GraphQlStateDiff class is not available on this version of Magento.');
         }
 
-        $this->graphQlStateDiff = new GraphQlStateDiff($this);
+        $this->graphQlStateDiff = new GraphQlStateDiff();
         parent::setUp();
     }
 

dev/tests/integration/testsuite/Magento/GraphQl/App/State/GraphQlStateDiff.php

@@ -57,18 +57,9 @@ class GraphQlStateDiff
 
     /**
      * Constructor
-     *
-     * @param TestCase $test
      */
-    public function __construct(TestCase $test)
+    public function __construct()
     {
-        if (8 == PHP_MAJOR_VERSION && 3 == PHP_MINOR_VERSION && PHP_RELEASE_VERSION  < 5) {
-            $test->markTestSkipped(
-                "This test isn't compatible with PHP 8.3 versions less than PHP 8.3.5 because of "
-                . "bug in garbage collector. https://github.com/php/php-src/issues/13569"
-                . " will roll back in AC-11491"
-            );
-        }
         $this->objectManagerBeforeTest = Bootstrap::getObjectManager();
         $this->objectManagerForTest = new ObjectManager($this->objectManagerBeforeTest);
         $this->objectManagerForTest->getFactory()->setObjectManager($this->objectManagerForTest);