MAGETWO-35076: Impossible to place order with DHL EU shipping method

Author: Pechenushko

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

@@ -1034,7 +1034,7 @@ protected function _parseResponse($response)
 
         if (strlen(trim($response)) > 0) {
             if (strpos(trim($response), '<?xml') === 0) {
-                $xml = simplexml_load_string($response);
+                $xml = $this->parseXml($response);
                 if (is_object($xml)) {
                     if (in_array($xml->getName(), ['ErrorResponse', 'ShipmentValidateErrorResponse'])
                         || isset($xml->GetQuoteResponse->Note->Condition)
@@ -1775,7 +1775,7 @@ protected function _parseXmlTrackingResponse($trackings, $response)
         $resultArr = [];
 
         if (strlen(trim($response)) > 0) {
-            $xml = simplexml_load_string($response);
+            $xml = $this->parseXml($response);
             if (!is_object($xml)) {
                 $errorTitle = __('Response is in the wrong format');
             }

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

@@ -706,7 +706,7 @@ protected function _parseXmlResponse($response)
         $priceArr = [];
 
         if (strlen(trim($response)) > 0) {
-            if ($xml = $this->_parseXml($response)) {
+            if ($xml = $this->parseXml($response)) {
                 if (is_object($xml->Error) && is_object($xml->Error->Message)) {
                     $errorTitle = (string)$xml->Error->Message;
                 } elseif (is_object($xml->SoftError) && is_object($xml->SoftError->Message)) {
@@ -760,27 +760,6 @@ protected function _parseXmlResponse($response)
         return $result;
     }
 
-    /**
-     * Parse XML string and return XML document object or false
-     *
-     * @param string $xmlContent
-     * @return \Magento\Shipping\Model\Simplexml\Element|bool
-     * @throws \Exception
-     */
-    protected function _parseXml($xmlContent)
-    {
-        try {
-            try {
-                return simplexml_load_string($xmlContent);
-            } catch (\Exception $e) {
-                throw new \Exception(__('Failed to parse xml document: %1', $xmlContent));
-            }
-        } catch (\Exception $e) {
-            $this->_logger->critical($e);
-            return false;
-        }
-    }
-
     /**
      * Get configuration data of carrier
      *

app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php

@@ -607,4 +607,25 @@ public function getMethodPrice($cost, $method = '')
             $cost
         );
     }
+
+    /**
+     * Parse XML string and return XML document object or false
+     *
+     * @param string $xmlContent
+     * @return \Magento\Shipping\Model\Simplexml\Element|bool
+     * @throws \Exception
+     */
+    public function parseXml($xmlContent)
+    {
+        try {
+            try {
+                return simplexml_load_string($xmlContent);
+            } catch (\Exception $e) {
+                throw new \Exception(__('Failed to parse xml document: %1', $xmlContent));
+            }
+        } catch (\Exception $e) {
+            $this->_logger->critical($e);
+            return false;
+        }
+    }
 }

app/code/Magento/Shipping/Test/Unit/Model/Carrier/AbstractCarrierOnlineTest.php

@@ -104,4 +104,12 @@ public function testComposePackages()
 
         $this->carrier->proccessAdditionalValidation($request);
     }
+
+    public function testParseXml()
+    {
+        $xmlString = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><GetResponse><value>42</value>></GetResponse>";
+        $simpleXmlElement = $this->carrier->parseXml($xmlString);
+        $this->assertEquals('GetResponse', $simpleXmlElement->getName());
+        $this->assertEquals(42, (int)$simpleXmlElement->value);
+    }
 }

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

@@ -512,7 +512,7 @@ protected function _parseXmlResponse($response)
                         $response
                     );
                 }
-                $xml = simplexml_load_string($response);
+                $xml = $this->parseXml($response);
 
                 if (is_object($xml)) {
                     $allowedMethods = explode(',', $this->getConfigData('allowed_methods'));
@@ -1042,7 +1042,7 @@ protected function _parseXmlTrackingResponse($trackingvalue, $response)
         $resultArr = [];
         if (strlen(trim($response)) > 0) {
             if (strpos(trim($response), '<?xml') === 0) {
-                $xml = simplexml_load_string($response);
+                $xml = $this->parseXml($response);
                 if (is_object($xml)) {
                     if (isset($xml->Number) && isset($xml->Description) && (string)$xml->Description != '') {
                         $errorTitle = (string)$xml->Description;
@@ -1869,7 +1869,7 @@ protected function _doShipmentRequest(\Magento\Framework\Object $request)
         $client->setParameterGet('XML', $requestXml);
         $response = $client->request()->getBody();
 
-        $response = simplexml_load_string($response);
+        $response = $this->parseXml($response);
         if ($response === false || $response->getName() == 'Error') {
             $debugData['result'] = [
                 'error' => $response->Description,