Merge remote-tracking branch 'upstream/develop' into pr

Author: Igor Melnikov

.gitignore

@@ -32,6 +32,8 @@ atlassian*
 
 /pub/media/*.*
 !/pub/media/.htaccess
+/pub/media/attribute/*
+!/pub/media/attribute/.htaccess
 /pub/media/analytics/*
 /pub/media/catalog/*
 !/pub/media/catalog/.htaccess

app/code/Magento/Backend/Block/Menu.php

@@ -13,6 +13,7 @@
  *
  * @method \Magento\Backend\Block\Menu setAdditionalCacheKeyInfo(array $cacheKeyInfo)
  * @method array getAdditionalCacheKeyInfo()
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Menu extends \Magento\Backend\Block\Template
 {
@@ -381,7 +382,7 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
             $itemName = substr($menuId, strrpos($menuId, '::') + 2);
             $itemClass = str_replace('_', '-', strtolower($itemName));
 
-            if (count($colBrakes) && $colBrakes[$itemPosition]['colbrake']) {
+            if (count($colBrakes) && $colBrakes[$itemPosition]['colbrake'] && $itemPosition != 1) {
                 $output .= '</ul></li><li class="column"><ul role="menu">';
             }
 

app/code/Magento/Braintree/Gateway/Response/CardDetailsHandler.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Braintree\Gateway\Response;
 
-use \Braintree\Transaction;
 use Magento\Braintree\Gateway\Config\Config;
 use Magento\Payment\Gateway\Helper\ContextHelper;
 use Magento\Sales\Api\Data\OrderPaymentInterface;

app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php

@@ -11,7 +11,6 @@
 use Magento\Bundle\Model\Product\Attribute\Source\Shipment\Type as ShipmentType;
 use Magento\Framework\Stdlib\ArrayManager;
 use Magento\Ui\Component\Container;
-use Magento\Ui\Component\DynamicRows;
 use Magento\Ui\Component\Form;
 use Magento\Ui\Component\Modal;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;

app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml

@@ -11,7 +11,8 @@
 <?php
 $idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
 /** @var \Magento\Bundle\Pricing\Render\FinalPriceBox $block */
-$productId = $block->getSaleableItem()->getId();
+
+
 /** @var \Magento\Bundle\Pricing\Price\FinalPrice $finalPriceModel */
 $finalPriceModel = $block->getPrice();
 $minimalPrice = $finalPriceModel->getMinimalPrice();

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

@@ -14,7 +14,6 @@
 use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
 use Magento\Catalog\Model\Product\Attribute\Backend\Media\EntryConverterPool;
-use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryExtensionFactory;
 
 /**
  * Catalog product model

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

@@ -1022,7 +1022,7 @@ public function delete($object)
         $this->getEntityManager()->delete($object);
         $this->_eventManager->dispatch(
             'catalog_category_delete_after_done',
-            ['product' => $object]
+            ['product' => $object, 'category' => $object]
         );
         return $this;
     }

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -863,6 +863,7 @@ public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
      * Filter Product by Categories
      *
      * @param array $categoriesFilter
+     * @return $this
      */
     public function addCategoriesFilter(array $categoriesFilter)
     {
@@ -876,6 +877,7 @@ public function addCategoriesFilter(array $categoriesFilter)
             ];
             $this->getSelect()->where($this->getConnection()->prepareSqlCondition('e.entity_id' , $selectCondition));
         }
+        return $this;
     }
 
     /**

app/code/Magento/Catalog/view/base/web/js/price-box.js

@@ -21,7 +21,6 @@ define([
 
     $.widget('mage.priceBox', {
         options: globalOptions,
-        cache: {},
 
         /**
          * Widget initialisation.
@@ -39,6 +38,7 @@ define([
          * Widget creating.
          */
         _create: function createPriceBox() {
+            this.cache = {};
             var box = this.element;
 
             this._setDefaultsFromPriceConfig();

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

@@ -6,7 +6,6 @@
 namespace Magento\Checkout\Model\Type;
 
 use Magento\Customer\Api\AccountManagementInterface;
-use Magento\Customer\Api\AddressMetadataInterface as AddressMetadata;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory as CustomerDataFactory;