Skip to content

Commit 46cf26b

Browse files
committed
MAGETWO-35076: Impossible to place order with DHL EU shipping method
- CR Changes
1 parent 02878f1 commit 46cf26b

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,8 @@ protected function _parseXmlResponse($response)
706706
$priceArr = [];
707707

708708
if (strlen(trim($response)) > 0) {
709-
if ($xml = $this->parseXml($response)) {
709+
$xml = $this->parseXml($response);
710+
if (is_object($xml)) {
710711
if (is_object($xml->Error) && is_object($xml->Error->Message)) {
711712
$errorTitle = (string)$xml->Error->Message;
712713
} elseif (is_object($xml->SoftError) && is_object($xml->SoftError->Message)) {

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -613,19 +613,9 @@ public function getMethodPrice($cost, $method = '')
613613
*
614614
* @param string $xmlContent
615615
* @return \Magento\Shipping\Model\Simplexml\Element|bool
616-
* @throws \Exception
617616
*/
618617
public function parseXml($xmlContent)
619618
{
620-
try {
621-
try {
622-
return simplexml_load_string($xmlContent);
623-
} catch (\Exception $e) {
624-
throw new \Exception(__('Failed to parse xml document: %1', $xmlContent));
625-
}
626-
} catch (\Exception $e) {
627-
$this->_logger->critical($e);
628-
return false;
629-
}
619+
return simplexml_load_string($xmlContent, 'Magento\Shipping\Model\Simplexml\Element');
630620
}
631621
}

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@
157157
['_parseDescription', 'Magento\Sales\Model\Order\Pdf\Items\AbstractItems'],
158158
['_parsePackageTheme', 'Magento\Widget\Model\Widget\Instance'],
159159
['_parseXmlTrackingResponse', 'Magento\Fedex\Model\Carrier'],
160+
['_parseXml', 'Magento\Fedex\Model\Carrier'],
160161
['_prepareCondition', 'Magento\CatalogSearch\Model\Advanced'],
161162
['_prepareConfigurableProductData', 'Magento\CatalogImportExport\Model\Export\Product'],
162163
['_prepareConfigurableProductPrice', 'Magento\CatalogImportExport\Model\Export\Product'],

0 commit comments

Comments
 (0)