Merge pull request #789 from magento-okapis/MAGETWO-63884-Prepare-2.0.15

Prepare code base for 2.0.15

Author: Oleksii Korshenko

app/code/Magento/Braintree/Test/Unit/Model/PaymentMethodTest.php

@@ -478,7 +478,7 @@ protected function setupOrderMock(
                     'getCustomerEmail',
                     'getCustomerId',
                     'getStoreId',
-                    'getTotalDue'
+                    'getBaseTotalDue'
                 ]
             )->getMock();
 
@@ -501,7 +501,7 @@ protected function setupOrderMock(
             ->method('getStoreId')
             ->willReturn($storeId);
         $orderMock->expects(static::any())
-            ->method('getTotalDue')
+            ->method('getBaseTotalDue')
             ->willReturn(self::TOTAL_AMOUNT);
 
         $this->orderRepository->expects(static::any())
@@ -1704,7 +1704,7 @@ protected function setupPaymentObjectForCapture($paymentId)
         $order = $this->getMockBuilder('Magento\Sales\Api\Data\OrderInterface')
             ->getMockForAbstractClass();
         $order->expects(static::any())
-            ->method('getTotalDue')
+            ->method('getBaseTotalDue')
             ->willReturn(self::TOTAL_AMOUNT);
         $this->orderRepository->expects(static::any())
             ->method('get')

app/code/Magento/Braintree/composer.json

@@ -22,7 +22,7 @@
         "magento/module-checkout-agreements": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.8",
+    "version": "100.0.9",
     "license": [
         "proprietary"
     ],

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Category;
 
+use Magento\Store\Model\StoreManagerInterface;
+
 /**
  * Class Save
  */
@@ -25,6 +27,11 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Category
      */
     protected $layoutFactory;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * Constructor
      *
@@ -82,6 +89,9 @@ public function execute()
         }
 
         $storeId = $this->getRequest()->getParam('store');
+        $store = $this->getStoreManager()->getStore($storeId);
+        $this->getStoreManager()->setCurrentStore($store->getCode());
+
         $refreshTree = false;
         $data = $this->getRequest()->getPostValue();
         if ($data) {
@@ -90,9 +100,7 @@ public function execute()
                 $parentId = $this->getRequest()->getParam('parent');
                 if (!$parentId) {
                     if ($storeId) {
-                        $parentId = $this->_objectManager->get(
-                            'Magento\Store\Model\StoreManagerInterface'
-                        )->getStore(
+                        $parentId = $this->getStoreManager()->getStore(
                             $storeId
                         )->getRootCategoryId();
                     } else {
@@ -211,4 +219,18 @@ public function execute()
             $redirectParams
         );
     }
+
+    /**
+     * Get StoreManager object
+     *
+     * @return StoreManagerInterface
+     */
+    private function getStoreManager()
+    {
+        if ($this->storeManager == null) {
+            $this->storeManager = $this->_objectManager->get(StoreManagerInterface::class);
+        }
+
+        return $this->storeManager;
+    }
 }

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

@@ -3,8 +3,12 @@
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Controller\Adminhtml\Product\Initialization;
 
+/**
+ * Product initialization helper class
+ */
 class Helper
 {
     /**
@@ -71,7 +75,7 @@ public function __construct(
      */
     public function initialize(\Magento\Catalog\Model\Product $product)
     {
-        $productData = $this->request->getPost('product');
+        $productData = $this->request->getPost('product', []);
         unset($productData['custom_attributes']);
         unset($productData['extension_attributes']);
 
@@ -144,6 +148,13 @@ public function initialize(\Magento\Catalog\Model\Product $product)
                 $productData['options'],
                 $this->request->getPost('options_use_default')
             );
+            foreach ($options as &$customOptionData) {
+                if (isset($customOptionData['values'])) {
+                    $customOptionData['values'] = array_filter($customOptionData['values'], function ($valueData) {
+                        return !($valueData['option_type_id'] == '-1' && !empty($valueData['is_delete']));
+                    });
+                }
+            }
             $product->setProductOptions($options);
         }
 

app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php

@@ -9,6 +9,9 @@
 use Magento\Backend\App\Action;
 use Magento\Catalog\Controller\Adminhtml\Product;
 
+/**
+ * Class that handle new product creation
+ */
 class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**

app/code/Magento/Catalog/Model/ResourceModel/Category/Collection/Factory.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Category\Collection;
 
+/**
+ * Category collection factory.
+ */
 class Factory
 {
     /**

app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php

@@ -6,6 +6,8 @@
 namespace Magento\Catalog\Model\ResourceModel\Category;
 
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\Catalog\Model\ResourceModel\Category\Flat\CollectionFactory as CategoryFlatCollectionFactory;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Category flat model
@@ -68,6 +70,7 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      * Category collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
+     * @deprecated
      */
     protected $_categoryCollectionFactory;
 
@@ -78,6 +81,11 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      */
     protected $_categoryFactory;
 
+    /**
+     * @var CategoryFlatCollectionFactory
+     */
+    private $categoryFlatCollectionFactory;
+
     /**
      * Class constructor
      *
@@ -399,7 +407,7 @@ public function getCategories($parent, $recursionLevel = 0, $sorted = false, $as
             );
             $parentPath = $this->getConnection()->fetchOne($select);
 
-            $collection = $this->_categoryCollectionFactory
+            $collection = $this->getCategoryFlatCollectionFactory()
                 ->create()
                 ->addNameToResult()
                 ->addUrlRewriteToResult()
@@ -690,4 +698,19 @@ public function getProductsPosition($category)
 
         return $this->getConnection()->fetchPairs($select, $bind);
     }
+
+    /**
+     * Get instance of CategoryFlatCollectionFactory
+     *
+     * @return CategoryFlatCollectionFactory
+     */
+    private function getCategoryFlatCollectionFactory()
+    {
+        if (!$this->categoryFlatCollectionFactory instanceof CategoryFlatCollectionFactory) {
+            $this->categoryFlatCollectionFactory = ObjectManager::getInstance()
+                ->get(CategoryFlatCollectionFactory::class);
+        }
+
+        return $this->categoryFlatCollectionFactory;
+    }
 }