Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-54211

Author: rganin

app/code/Magento/Braintree/etc/adminhtml/di.xml

@@ -19,7 +19,7 @@
         </arguments>
     </type>
 
-    <virtualType name="BraintreeAuthorizeDataBuilder" type="Magento\Payment\Gateway\Request\BuilderComposite">
+    <virtualType name="BraintreeAuthorizeRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
         <arguments>
             <argument name="builders" xsi:type="array">
                 <item name="customer" xsi:type="string">Magento\Braintree\Gateway\Request\CustomerDataBuilder</item>
@@ -30,7 +30,7 @@
             </argument>
         </arguments>
     </virtualType>
-    <virtualType name="BraintreeVaultAuthorizeDataBuilder" type="Magento\Payment\Gateway\Request\BuilderComposite">
+    <virtualType name="BraintreeVaultAuthorizeRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
         <arguments>
             <argument name="builders" xsi:type="array">
                 <item name="customer" xsi:type="string">Magento\Braintree\Gateway\Request\CustomerDataBuilder</item>

app/code/Magento/Quote/Model/Quote/Item/CartItemPersister.php

@@ -71,7 +71,9 @@ public function save(CartInterface $quote, CartItemInterface $item)
                     /** Update item product options */
                     $item = $quote->updateItem($itemId, $buyRequestData);
                 } else {
-                    $currentItem->setQty($qty);
+                    if ($item->getQty() !== $currentItem->getQty()) {
+                        $currentItem->setQty($qty);
+                    }
                 }
             } else {
                 /** add new item to shopping cart */

app/code/Magento/Quote/Model/QuoteRepository/SaveHandler.php

@@ -5,10 +5,8 @@
  */
 namespace Magento\Quote\Model\QuoteRepository;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Framework\Exception\InputException;
-use Magento\Framework\Exception\CouldNotSaveException;
 
 class SaveHandler
 {
@@ -32,11 +30,6 @@ class SaveHandler
      */
     private $shippingAssignmentPersister;
 
-    /**
-     * @var \Magento\Framework\Message\PhraseFactory
-     */
-    private $phraseFactory;
-
     /**
      * @param \Magento\Quote\Model\ResourceModel\Quote $quoteResource
      * @param \Magento\Quote\Model\Quote\Item\CartItemPersister $cartItemPersister
@@ -77,13 +70,6 @@ public function save(CartInterface $quote)
                 }
             }
         }
-        $errors = $quote->getErrors();
-        if (!empty($errors)) {
-            $phraseFactory = $this->getPhraseFactory();
-            throw new CouldNotSaveException(
-                $phraseFactory->create('Following errors occurred on save: %1', $errors)
-            );
-        }
 
         // Billing Address processing
         $billingAddress = $quote->getBillingAddress();
@@ -97,18 +83,6 @@ public function save(CartInterface $quote)
         return $quote;
     }
 
-    /**
-     * @deprecated
-     * @return \Magento\Framework\Message\PhraseFactory
-     */
-    private function getPhraseFactory()
-    {
-        if (!is_object($this->phraseFactory)) {
-            $this->phraseFactory = ObjectManager::getInstance()->get(\Magento\Framework\Message\PhraseFactory::class);
-        }
-        return $this->phraseFactory;
-    }
-
     /**
      * @param \Magento\Quote\Model\Quote $quote
      * @return void

dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/IndexerBuilderTest.php

@@ -99,11 +99,10 @@ public function testReindexFull()
 
         $this->indexerBuilder->reindexFull();
 
-        $this->assertEquals(9.8, $this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $this->product->getId()));
-        $this->assertEquals(
-            9.8,
-            $this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $this->productSecond->getId())
-        );
+        $rulePrice = $this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $this->product->getId());
+        $this->assertEquals(9.8, $rulePrice);
+        $rulePrice = $this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $this->productSecond->getId());
+        $this->assertEquals(9.8, $rulePrice);
         $this->assertFalse($this->resourceRule->getRulePrice(new \DateTime(), 1, 1, $this->productThird->getId()));
     }
 
@@ -113,7 +112,7 @@ protected function prepareProducts()
         $product->load($product->getId());
         $this->product = $product;
 
-        $this->product->setData('test_attribute', 'test_attribute_value')->save();
+        $this->product->setStoreId(0)->setData('test_attribute', 'test_attribute_value')->save();
         $this->productSecond = clone $this->product;
         $this->productSecond->setId(null)->setUrlKey('product-second')->save();
         $this->productThird = clone $this->product;

lib/internal/Magento/Framework/EntityManager/Operation/Create/CreateAttributes.php

@@ -56,7 +56,7 @@ public function execute($entity, $arguments = [])
         $entityData = array_merge($hydrator->extract($entity), $arguments);
         $actions = $this->attributePool->getActions($entityType, 'create');
         foreach ($actions as $action) {
-            $action->execute($entityType, $entityData);
+            $action->execute($entityType, $entityData, $arguments);
         }
         $entity = $hydrator->hydrate($entity, $entityData);
         return $entity;

lib/internal/Magento/Framework/EntityManager/Operation/Read.php

@@ -110,7 +110,7 @@ public function execute($entity, $identifier, $arguments = [])
                 'arguments' => $arguments
             ]
         );
-        $entity = $this->readMain->execute($entity, $identifier, $arguments);
+        $entity = $this->readMain->execute($entity, $identifier);
         $entityData = array_merge($hydrator->extract($entity), $arguments);
         if (isset($entityData[$metadata->getLinkField()])) {
             $entity = $this->readAttributes->execute($entity, $arguments);