Merge pull request #350 from magento-folks/MAGETWO-48544

[Folks] Public GitHub Pull Request Processing

Author: Idolov, Stanislav(sidolov)

app/code/Magento/Backend/Block/Widget/Tabs.php

@@ -112,7 +112,7 @@ public function addTabAfter($tabId, $tab, $afterTabId)
     public function addTab($tabId, $tab)
     {
         if (empty($tabId)) {
-            throw new \Exception(__('Please correct the tab configuration and try again. Tab Id should be not empry'));
+            throw new \Exception(__('Please correct the tab configuration and try again. Tab Id should be not empty'));
         }
         if (is_array($tab)) {
             $this->_tabs[$tabId] = new \Magento\Framework\DataObject($tab);

app/code/Magento/Checkout/Model/Type/Onepage.php

@@ -445,7 +445,9 @@ public function saveShipping($data, $customerAddressId)
                 if (!isset($data[$attributeCode])) {
                     $address->setData($attributeCode, null);
                 } else {
-                    $address->setDataUsingMethod($attributeCode, $compactedData[$attributeCode]);
+                    if (isset($compactedData[$attributeCode])) {
+                        $address->setDataUsingMethod($attributeCode, $compactedData[$attributeCode]);
+                    }
                 }
             }
 

app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml

@@ -183,8 +183,9 @@
                     </block>
                 </container>
                 <container name="checkout.cart.noitems" as="no-items">
-                    <block class="Magento\Checkout\Block\Cart" name="checkout.cart.empty" before="-" template="cart/noItems.phtml"/>
-                    <container name="checkout.cart.empty.widget" as="checkout_cart_empty_widget" label="Empty Shopping Cart Content Before"/>
+                    <block class="Magento\Checkout\Block\Cart" name="checkout.cart.empty" before="-" template="cart/noItems.phtml">
+                        <container name="checkout.cart.empty.widget" as="checkout_cart_empty_widget" label="Empty Shopping Cart Content Before"/>
+                    </block>
                 </container>
             </block>
         </referenceContainer>

app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php

@@ -1514,7 +1514,7 @@ public function setOrder($attribute, $dir = self::SORT_ORDER_ASC)
     public function toArray($arrAttributes = [])
     {
         $arr = [];
-        foreach ($this->_items as $key => $item) {
+        foreach ($this->getItems() as $key => $item) {
             $arr[$key] = $item->toArray($arrAttributes);
         }
         return $arr;