Merge remote-tracking branch 'mainline/develop' into PR_Branch

Author: Olga Kopylova

app/code/Magento/Backend/Block/Widget/Button/Item.php

@@ -16,4 +16,25 @@
  */
 class Item extends \Magento\Framework\Object
 {
+    /**
+     * Object delete flag
+     *
+     * @var bool
+     */
+    protected $_isDeleted = false;
+
+    /**
+     * Set _isDeleted flag value (if $isDeleted parameter is defined) and return current flag value
+     *
+     * @param boolean $isDeleted
+     * @return bool
+     */
+    public function isDeleted($isDeleted = null)
+    {
+        $result = $this->_isDeleted;
+        if ($isDeleted !== null) {
+            $this->_isDeleted = $isDeleted;
+        }
+        return $result;
+    }
 }

app/code/Magento/Backup/Model/Resource/Db.php

@@ -124,7 +124,6 @@ public function getTableStatus($tableName)
 
         if ($row) {
             $statusObject = new \Magento\Framework\Object();
-            $statusObject->setIdFieldName('name');
             foreach ($row as $field => $value) {
                 $statusObject->setData(strtolower($field), $value);
             }

app/code/Magento/Bundle/Model/Option.php

@@ -53,7 +53,10 @@ protected function _construct()
      */
     public function addSelection(\Magento\Catalog\Model\Product $selection)
     {
-        $selections = $this->getDataSetDefault('selections', []);
+        if (!$this->hasData('selections')) {
+            $this->setData('selections', []);
+        }
+        $selections = $this->getData('selections');
         $selections[] = $selection;
         $this->setSelections($selections);
     }

app/code/Magento/Catalog/Model/Product/Visibility.php

@@ -49,7 +49,6 @@ public function __construct(
     ) {
         $this->_eavEntityAttribute = $eavEntityAttribute;
         parent::__construct($data);
-        $this->setIdFieldName('visibility_id');
     }
 
     /**

app/code/Magento/Catalog/Model/Resource/Product/Action.php

@@ -40,7 +40,7 @@ protected function _construct()
     public function updateAttributes($entityIds, $attrData, $storeId)
     {
         $object = new \Magento\Framework\Object();
-        $object->setIdFieldName('entity_id')->setStoreId($storeId);
+        $object->setStoreId($storeId);
 
         $this->_getWriteAdapter()->beginTransaction();
         try {
@@ -54,6 +54,7 @@ public function updateAttributes($entityIds, $attrData, $storeId)
                 foreach ($entityIds as $entityId) {
                     $i++;
                     $object->setId($entityId);
+                    $object->setEntityId($entityId);
                     // collect data for save
                     $this->_saveAttributeValue($object, $attribute, $value);
                     // save collected data every 1000 rows

app/code/Magento/Catalog/Model/Resource/Url.php

@@ -432,7 +432,8 @@ protected function _getCategories($categoryIds, $storeId = null, $path = null)
             }
 
             $category = new \Magento\Framework\Object($row);
-            $category->setIdFieldName('entity_id');
+            $category->setId($row['entity_id']);
+            $category->setEntityId($row['entity_id']);
             $category->setStoreId($storeId);
             $this->_prepareCategoryParentId($category);
 
@@ -535,7 +536,8 @@ protected function _getProducts($productIds, $storeId, $entityId, &$lastEntityId
         $rowSet = $adapter->fetchAll($select, $bind);
         foreach ($rowSet as $row) {
             $product = new \Magento\Framework\Object($row);
-            $product->setIdFieldName('entity_id');
+            $product->setId($row['entity_id']);
+            $product->setEntityId($row['entity_id']);
             $product->setCategoryIds([]);
             $product->setStoreId($storeId);
             $products[$product->getId()] = $product;

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php

@@ -627,7 +627,7 @@ protected function getProductEmulator($typeId)
     {
         if (!isset($this->productEmulators[$typeId])) {
             $productEmulator = new \Magento\Framework\Object();
-            $productEmulator->setIdFieldName('entity_id')->setTypeId($typeId);
+            $productEmulator->setTypeId($typeId);
             $this->productEmulators[$typeId] = $productEmulator;
         }
         return $this->productEmulators[$typeId];

app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php

@@ -56,7 +56,7 @@ public function __construct(
     /**
      * Build category URL path
      *
-     * @param \Magento\Catalog\Api\Data\CategoryInterface|\Magento\Framework\Object $category
+     * @param \Magento\Catalog\Api\Data\CategoryInterface|\Magento\Framework\Model\AbstractModel $category
      * @return string
      */
     public function getUrlPath($category)

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ObjectRegistryTest.php

@@ -18,8 +18,7 @@ class ObjectRegistryTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->object = $this->getMock('Magento\Framework\Object');
-        $this->object->expects($this->any())->method('getId')->will($this->returnValue(1));
+        $this->object = new \Magento\Framework\Object(['id' => 1]);
         $this->objectRegistry = (new ObjectManager($this))->getObject(
             'Magento\CatalogUrlRewrite\Model\ObjectRegistry',
             ['entities' => [$this->object]]

app/code/Magento/Checkout/Model/Cart.php

@@ -501,9 +501,7 @@ public function updateItems($data)
             if ($qty > 0) {
                 $item->setQty($qty);
 
-                $itemInQuote = $this->getQuote()->getItemById($item->getId());
-
-                if (!$itemInQuote && $item->getHasError()) {
+                if ($item->getHasError()) {
                     throw new \Magento\Framework\Exception\LocalizedException(__($item->getMessage()));
                 }
 
@@ -527,6 +525,7 @@ public function updateItems($data)
             'checkout_cart_update_items_after',
             ['cart' => $this, 'info' => $infoDataObject]
         );
+
         return $this;
     }