Merge remote-tracking branch 'andrew/fixes-for-data-object-part2' into ph-delivery

Author: xmav

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php

@@ -102,7 +102,9 @@ protected function _getCurrencyCode($row)
         if ($code = $this->getColumn()->getCurrencyCode()) {
             return $code;
         }
-        if ($code = $row->getData($this->getColumn()->getCurrency())) {
+        $currency = $this->getColumn()->getCurrency();
+
+        if ($currency !== null && $code = $row->getData($currency)) {
             return $code;
         }
 

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php

@@ -60,7 +60,7 @@ public function render(\Magento\Framework\DataObject $row)
                 return $data;
             }
 
-            $data = (float)$data * $this->_getRate($row);
+            $data = (float) $data * $this->_getRate($row);
             $data = sprintf("%f", $data);
             $data = $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
             return $data;
@@ -79,7 +79,9 @@ protected function _getCurrencyCode($row)
         if ($code = $this->getColumn()->getCurrencyCode()) {
             return $code;
         }
-        if ($code = $row->getData($this->getColumn()->getCurrency())) {
+        $currency = $this->getColumn()->getCurrency();
+
+        if ($currency !== null && $code = $row->getData($currency)) {
             return $code;
         }
         return false;
@@ -94,10 +96,12 @@ protected function _getCurrencyCode($row)
     protected function _getRate($row)
     {
         if ($rate = $this->getColumn()->getRate()) {
-            return (float)$rate;
+            return (float) $rate;
         }
-        if ($rate = $row->getData($this->getColumn()->getRateField())) {
-            return (float)$rate;
+        $rateField = $this->getColumn()->getRateField();
+
+        if ($rateField !== null && $rate = $row->getData($rateField)) {
+            return (float) $rate;
         }
         return 1;
     }

lib/internal/Magento/Framework/DataObject.php

@@ -368,7 +368,8 @@ public function toString($format = '')
         } else {
             preg_match_all('/\{\{([a-z0-9_]+)\}\}/is', $format, $matches);
             foreach ($matches[1] as $var) {
-                $format = str_replace('{{' . $var . '}}', $this->getData($var), $format);
+                $data = $this->getData($var) ?? '';
+                $format = str_replace('{{' . $var . '}}', $data, $format);
             }
             $result = $format;
         }