ENGCOM-8537: Fix wrong format error DHL shipping label #31021

 - Merge Pull Request #31021 from vpsnak/magento2:dhl-mbstring-labels
 - Merged commits:
   1. ba1a339
   2. a8c72b0
   3. 0bdf6ab
   4. 93c09b3
   5. 923091e
   6. 72574a8
   7. a3536cb
   8. f5ed249
   9. ca76fdb
   10. b0e5d5a
   11. 22f4f8e
   12. f20cf58
   13. cff6a6f
   14. ff97950
   15. 8749553
   16. 673bd22

Author: magento-engcom-team

app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckConfigsChangesIsNotAffectedStartedCheckoutProcessTest.xml

@@ -58,6 +58,11 @@
             <argument name="address" value="US_Address_TX"/>
         </actionGroup>
 
+        <!-- Select Free Shipping -->
+        <actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="setShippingMethodFreeShipping">
+            <argument name="shippingMethodName" value="Free Shipping"/>
+        </actionGroup>
+
         <!-- Assert Free Shipping checkbox -->
         <seeCheckboxIsChecked selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="freeShippingMethodCheckboxIsChecked"/>
 

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartTest.xml

@@ -94,7 +94,7 @@
         <actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="selectViewAndEditCart"/>
 
         <!--Assert Shopping Cart Summary-->
-        <actionGroup ref="AssertStorefrontShoppingCartSummaryWithShippingActionGroup" stepKey="AssertCartSummary" >
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="AssertCartSummary" >
             <argument name="subtotal" value="$100.00"/>
             <argument name="shipping" value="10.00"/>
             <argument name="total" value="110.00"/>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddOneBundleMultiSelectOptionToTheShoppingCartTest.xml

@@ -88,7 +88,7 @@
         <actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="selectViewAndEditCart"/>
 
         <!--Assert Shopping Cart Summary-->
-        <actionGroup ref="AssertStorefrontShoppingCartSummaryWithShippingActionGroup" stepKey="AssertCartSummary" >
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="AssertCartSummary" >
             <argument name="subtotal" value="$50.00"/>
             <argument name="shipping" value="5.00"/>
             <argument name="total" value="55.00"/>

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

@@ -1756,7 +1756,7 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
             foreach ($package['items'] as $item) {
                 $content[] = $item['name'];
             }
-            $nodePiece->addChild('PieceContents', substr(implode(',', $content), 0, 34));
+            $nodePiece->addChild('PieceContents', $this->string->substr(implode(',', $content), 0, 34));
         }
 
         $nodeShipmentDetails->addChild('Weight', sprintf('%.3f', $rawRequest->getPackageWeight()));
@@ -1776,7 +1776,7 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
         $nodeShipmentDetails->addChild('DoorTo', 'DD');
         $nodeShipmentDetails->addChild('DimensionUnit', substr($this->_getDimensionUnit(), 0, 1));
         $contentType = isset($package['params']['container']) ? $package['params']['container'] : '';
-        $packageType = $contentType === self::DHL_CONTENT_TYPE_NON_DOC ? 'CP' : '';
+        $packageType = $contentType === self::DHL_CONTENT_TYPE_NON_DOC ? 'CP' : 'EE';
         $nodeShipmentDetails->addChild('PackageType', $packageType);
         if ($this->isDutiable($rawRequest->getOrigCountryId(), $rawRequest->getDestCountryId())) {
             $nodeShipmentDetails->addChild('IsDutiable', 'Y');

dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php

@@ -17,19 +17,22 @@
 use Magento\Quote\Model\Quote\Address\RateRequest;
 use Magento\Quote\Model\Quote\Address\RateResult\Error;
 use Magento\Shipping\Model\Shipment\Request;
+use Magento\Shipping\Model\Simplexml\Element as ShippingElement;
 use Magento\Shipping\Model\Tracking\Result\Status;
 use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\HTTP\AsyncClientInterfaceMock;
-use Magento\Shipping\Model\Simplexml\Element as ShippingElement;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test for DHL integration.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CarrierTest extends \PHPUnit\Framework\TestCase
+class CarrierTest extends TestCase
 {
+    private const PRODUCT_NAME_SPECIAL_CHARS = 'Φυστίκι Ψημένο με Αλάτι Συσκευασία';
+
     /**
      * @var Carrier
      */
@@ -254,10 +257,16 @@ private function assertTrackingResult($expectedTrackingData, $trackingResults):
      * @param string $origCountryId
      * @param string $expectedRegionCode
      * @param string $destCountryId
+     * @param bool|null $isProductNameContainsSpecialChars
+     * @return void
      * @dataProvider requestToShipmentDataProvider
      */
-    public function testRequestToShip(string $origCountryId, string $expectedRegionCode, string $destCountryId): void
-    {
+    public function testRequestToShip(
+        string $origCountryId,
+        string $expectedRegionCode,
+        string $destCountryId,
+        bool $isProductNameContainsSpecialChars = false
+    ): void {
         $this->config->setValue(
             'shipping/origin/country_id',
             $origCountryId,
@@ -274,6 +283,8 @@ public function testRequestToShip(string $origCountryId, string $expectedRegionC
                 )
             ]
         );
+        $productName = $isProductNameContainsSpecialChars ? self::PRODUCT_NAME_SPECIAL_CHARS : 'item_name';
+
         //phpcs:enable Magento2.Functions.DiscouragedFunction
         $request = new Request(
             [
@@ -291,7 +302,7 @@ public function testRequestToShip(string $origCountryId, string $expectedRegionC
                         ],
                         'items' => [
                             'item1' => [
-                                'name' => 'item_name',
+                                'name' => $productName,
                             ],
                         ],
                     ],
@@ -329,10 +340,15 @@ public function testRequestToShip(string $origCountryId, string $expectedRegionC
         $requestElement->Request->ServiceHeader->MessageReference = 'MAGE_SHIP_28TO32_Char_CHECKED';
         $requestElement->Request->ServiceHeader->MessageTime = 'currentTime';
         $requestElement->ShipmentDetails->Date = 'currentTime';
-        $this->assertXmlStringEqualsXmlString(
-            $this->getExpectedLabelRequestXml($origCountryId, $destCountryId, $expectedRegionCode),
-            $requestElement->asXML()
+
+        $expectedLabelRequest = $this->getExpectedLabelRequestXml(
+            $origCountryId,
+            $destCountryId,
+            $expectedRegionCode,
+            $isProductNameContainsSpecialChars
         );
+
+        $this->assertXmlStringEqualsXmlString($expectedLabelRequest, $requestElement->asXML());
     }
 
     /**
@@ -351,7 +367,10 @@ public function requestToShipmentDataProvider(): array
             ],
             [
                 'DE', 'EU', 'DE'
-            ]
+            ],
+            [
+                'GB', 'EU', 'US', true
+            ],
         ];
     }
 
@@ -361,12 +380,14 @@ public function requestToShipmentDataProvider(): array
      * @param string $origCountryId
      * @param string $destCountryId
      * @param string $regionCode
+     * @param bool $isProductNameContainsSpecialChars
      * @return string
      */
     private function getExpectedLabelRequestXml(
         string $origCountryId,
         string $destCountryId,
-        string $regionCode
+        string $regionCode,
+        bool $isProductNameContainsSpecialChars
     ): string {
         $countryNames = [
             'US' => 'United States Of America',
@@ -387,6 +408,10 @@ private function getExpectedLabelRequestXml(
         $expectedRequestElement->Shipper->CountryName = $countryNames[$origCountryId];
         $expectedRequestElement->RegionCode = $regionCode;
 
+        if ($isProductNameContainsSpecialChars) {
+            $expectedRequestElement->ShipmentDetails->Pieces->Piece->PieceContents = self::PRODUCT_NAME_SPECIAL_CHARS;
+        }
+
         return $expectedRequestElement->asXML();
     }