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

Author: xmav

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

@@ -97,7 +97,9 @@ protected function _getValue(DataObject $row)
             }
             return '';
         }
-        return $row->getData($this->getColumn()->getIndex());
+        return $this->getColumn()->getIndex() !== null
+            ? $row->getData($this->getColumn()->getIndex())
+            : null;
     }
 
     /**

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

@@ -118,11 +118,14 @@ 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 $this->_defaultBaseCurrency->getRate($this->_getCurrencyCode($row));
     }
 

lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/Document.php

@@ -10,7 +10,7 @@
 use Magento\Framework\Api\AttributeValueFactory;
 
 /**
- * Class Document
+ * The document data provider
  */
 class Document extends DataObject implements DocumentInterface
 {
@@ -33,17 +33,23 @@ public function __construct(AttributeValueFactory $attributeValueFactory)
     }
 
     /**
+     * Gets ID.
+     *
      * @return int|string
      */
     public function getId()
     {
         if (!$this->id) {
-            $this->id = $this->getData($this->getIdFieldName());
+            $this->id = $this->getIdFieldName() !== null
+                ? $this->getData($this->getIdFieldName())
+                : null;
         }
         return $this->id;
     }
 
     /**
+     * Sets ID.
+     *
      * @param int $id
      * @return void
      */