Merge 00efa0d into develop

magento-team · web-flow · commit 3f041dce1a3e · 2017-03-21T21:31:32.000Z
diff --git a/.gitignore b/.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
diff --git a/app/code/Magento/Braintree/Gateway/Response/CardDetailsHandler.php b/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;
diff --git a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php b/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;
diff --git a/app/code/Magento/Catalog/Model/Product.php b/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
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/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;
     }
diff --git a/app/code/Magento/Catalog/view/base/web/js/price-box.js b/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();
diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/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;
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
@@ -164,6 +164,8 @@ define([
             if (!availableRate && window.checkoutConfig.selectedShippingMethod) {
                 availableRate = window.checkoutConfig.selectedShippingMethod;
                 selectShippingMethodAction(window.checkoutConfig.selectedShippingMethod);
+
+                return;
             }
 
             //Unset selected shipping method if not available
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php
@@ -7,7 +7,6 @@
 namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product\Attribute;
 
 use Magento\Backend\App\Action;
-use Magento\Catalog\Controller\Adminhtml\Product;
 use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
 
 class CreateOptions extends Action
diff --git a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
@@ -82,7 +82,7 @@ public function getChildren($sku)
             foreach ($child->getAttributes() as $attribute) {
                 $attrCode = $attribute->getAttributeCode();
                 $value = $child->getDataUsingMethod($attrCode) ?: $child->getData($attrCode);
-                if (null !== $value && $attrCode != 'entity_id') {
+                if (null !== $value) {
                     $attributes[$attrCode] = $value;
                 }
             }
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
@@ -10,7 +10,6 @@
 use Magento\Framework\Model\AbstractExtensibleModel;
 use Magento\Quote\Api\Data\PaymentInterface;
 use Magento\Quote\Model\Quote\Address;
-use Magento\Sales\Model\ResourceModel;
 use Magento\Sales\Model\Status;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
diff --git a/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php b/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sales\Model\ResourceModel;
 
-use Magento\Framework\App\ResourceConnection as AppResource;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php
@@ -10,7 +10,6 @@
 use Magento\Sales\Model\OrderRepository;
 use Magento\Sales\Model\ResourceModel\Metadata;
 use Magento\Sales\Api\Data\OrderSearchResultInterfaceFactory as SearchResultFactory;
-use Magento\Framework\Api\SortOrder;
 
 /**
  * Class OrderRepositoryTest
diff --git a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
@@ -186,7 +186,9 @@ protected function prepareOptionIds(array $optionsArray)
     {
         if (isset($optionsArray['value']) && is_array($optionsArray['value'])) {
             foreach (array_keys($optionsArray['value']) as $optionId) {
-                if (isset($optionsArray['delete']) && $optionsArray['delete'][$optionId] == 1) {
+                if (isset($optionsArray['delete']) && isset($optionsArray['delete'][$optionId])
+                    && $optionsArray['delete'][$optionId] == 1
+                ) {
                     unset($optionsArray['value'][$optionId]);
                 }
             }
diff --git a/app/code/Magento/Ui/Component/Control/SplitButton.php b/app/code/Magento/Ui/Component/Control/SplitButton.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Ui\Component\Control;
 
-use Magento\Framework\View\Element\Template;
-
 /**
  * Class SplitButton
  *
diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
@@ -17,7 +17,6 @@
 use Magento\Framework\Exception\AuthorizationException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Phrase;
 use Magento\Framework\App\ProductMetadataInterface;
 use \Magento\Framework\Api\SimpleDataObjectConverter;
 
diff --git a/app/etc/di.xml b/app/etc/di.xml
@@ -324,11 +324,6 @@
             <argument name="cacheFrontend" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Cache\Config\Reader">
-        <arguments>
-            <argument name="fileName" xsi:type="string">cache.xml</argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\Cache\Config\Data">
         <arguments>
             <argument name="cacheId" xsi:type="string">config_cache</argument>
diff --git a/composer.json b/composer.json
@@ -43,7 +43,7 @@
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
         "pelago/emogrifier": "0.1.1",
-        "tubalmartin/cssmin": "2.4.8-p4",
+        "tubalmartin/cssmin": "2.4.8-p6",
         "magento/magento-composer-installer": ">=0.1.11",
         "braintree/braintree_php": "3.7.0",
         "symfony/console": "~2.3, !=2.7.0",
diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json
@@ -34,7 +34,7 @@
         "composer/composer": "1.0.0-alpha9",
         "monolog/monolog": "1.11.0",
         "oyejorge/less.php": "1.7.0.3",
-        "tubalmartin/cssmin": "2.4.8-p4",
+        "tubalmartin/cssmin": "2.4.8-p6",
         "magento/magento-composer-installer": "*",
         "phpseclib/phpseclib": "~0.3",
         "symfony/console": "~2.3",
diff --git a/lib/internal/Magento/Framework/Config/Theme.php b/lib/internal/Magento/Framework/Config/Theme.php
@@ -9,8 +9,6 @@
  */
 namespace Magento\Framework\Config;
 
-use Magento\Framework\Config\Composer\Package;
-
 class Theme
 {
     /**
diff --git a/lib/internal/Magento/Framework/Profiler/Driver/Factory.php b/lib/internal/Magento/Framework/Profiler/Driver/Factory.php
@@ -5,9 +5,6 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Profiler\Driver;
 
 use Magento\Framework\Profiler\DriverInterface;
@@ -65,7 +62,10 @@ public function create(array $config = null)
         $driver = new $class($config);
         if (!$driver instanceof DriverInterface) {
             throw new \InvalidArgumentException(
-                sprintf("Driver class \"%s\" must implement \Magento\Framework\Profiler\DriverInterface.", get_class($driver))
+                sprintf(
+                    "Driver class \"%s\" must implement \Magento\Framework\Profiler\DriverInterface.",
+                    get_class($driver)
+                )
             );
         }
         return $driver;
diff --git a/lib/internal/Magento/Framework/Profiler/Driver/Standard/Stat.php b/lib/internal/Magento/Framework/Profiler/Driver/Standard/Stat.php
@@ -15,23 +15,14 @@ class Stat
      * #@+ Timer statistics data keys
      */
     const ID = 'id';
-
     const START = 'start';
-
     const TIME = 'sum';
-
     const COUNT = 'count';
-
     const AVG = 'avg';
-
     const REALMEM = 'realmem';
-
     const REALMEM_START = 'realmem_start';
-
     const EMALLOC = 'emalloc';
-
     const EMALLOC_START = 'emalloc_start';
-
     /**#@-*/
 
     /**
diff --git a/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php b/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php
@@ -202,7 +202,7 @@ public function testLoadData($area, $forceReload, $cachedData)
         $expected = [
             'module original' => 'module translated',
             'module theme' => 'theme translated overwrite',
-            'module pack' => 'pack translated overwrite',
+            'module pack' => 'theme-pack translated overwrite',
             'module db' => 'db translated overwrite',
             'theme original' => 'theme translated',
             'pack original' => 'pack translated',
diff --git a/lib/internal/Magento/Framework/Translate.php b/lib/internal/Magento/Framework/Translate.php
@@ -182,8 +182,8 @@ public function loadData($area = null, $forceReload = false)
         $this->_data = [];
 
         $this->_loadModuleTranslation();
-        $this->_loadThemeTranslation();
         $this->_loadPackTranslation();
+        $this->_loadThemeTranslation();
         $this->_loadDbTranslation();
 
         if (!$forceReload) {

Original file line number	Diff line number	Diff line change
`@@ -1022,7 +1022,7 @@ public function delete($object)`
`1022`	`1022`	`$this->getEntityManager()->delete($object);`
`1023`	`1023`	`$this->_eventManager->dispatch(`
`1024`	`1024`	`'catalog_category_delete_after_done',`
`1025`		`- ['product' => $object]`
	`1025`	`+ ['product' => $object, 'category' => $object]`
`1026`	`1026`	`);`
`1027`	`1027`	`return $this;`
`1028`	`1028`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,8 @@ define([`
`164`	`164`	`if (!availableRate && window.checkoutConfig.selectedShippingMethod) {`
`165`	`165`	`availableRate = window.checkoutConfig.selectedShippingMethod;`
`166`	`166`	`selectShippingMethodAction(window.checkoutConfig.selectedShippingMethod);`
	`167`	`+`
	`168`	`+ return;`
`167`	`169`	`}`
`168`	`170`
`169`	`171`	`//Unset selected shipping method if not available`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function getChildren($sku)`
`82`	`82`	`foreach ($child->getAttributes() as $attribute) {`
`83`	`83`	`$attrCode = $attribute->getAttributeCode();`
`84`	`84`	`$value = $child->getDataUsingMethod($attrCode) ?: $child->getData($attrCode);`
`85`		`- if (null !== $value && $attrCode != 'entity_id') {`
	`85`	`+ if (null !== $value) {`
`86`	`86`	`$attributes[$attrCode] = $value;`
`87`	`87`	`}`
`88`	`88`	`}`