Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into develop

Author: bwaters

app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml

@@ -50,6 +50,7 @@ require([
             showTime: false,
             showHour: false,
             showMinute: false,
+            serverTimezoneSeconds: <?php echo (int) $block->getStoreTimestamp(); ?>,
             yearRange: '<?php /* @escapeNotVerified */ echo $block->getYearRange() ?>'
         }
     });

app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml

@@ -74,7 +74,7 @@
                 </field>
                 <field name="theme">
                     <argument name="data" xsi:type="array">
-                        <item name="options" xsi:type="object">Magento\Framework\View\Design\Theme\Label</item>
+                        <item name="options" xsi:type="object">Magento\Theme\Model\Design\Theme\Label</item>
                         <item name="config" xsi:type="array">
                             <item name="formElement" xsi:type="string">select</item>
                             <item name="dataType" xsi:type="string">text</item>

app/code/Magento/Bundle/Model/Product/Price.php

@@ -183,8 +183,9 @@ public function getFinalPrice($qty, $product)
         $finalPrice = $this->_applyOptionsPrice($product, $qty, $finalPrice);
         $finalPrice += $this->getTotalBundleItemsPrice($product, $qty);
 
+        $finalPrice = max(0, $finalPrice);
         $product->setFinalPrice($finalPrice);
-        return max(0, $product->getData('final_price'));
+        return $finalPrice;
     }
 
     /**

app/code/Magento/Catalog/Api/AttributeSetFinderInterface.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ *
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Api;
+
+interface AttributeSetFinderInterface
+{
+    /**
+     * Get attribute set ids by product ids
+     *
+     * @param array $productIds
+     * @return array
+     */
+    public function findAttributeSetIdsByProductIds(array $productIds);
+}

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php

@@ -70,11 +70,11 @@ protected function _prepareForm()
         }
         $this->_coreRegistry->register('attribute_type_hidden_fields', $_hiddenFields);
 
-        $this->_eventManager->dispatch('product_attribute_form_build_main_tab', ['form' => $form]);
-
         $frontendInputValues = array_merge($frontendInputElm->getValues(), $additionalTypes);
         $frontendInputElm->setValues($frontendInputValues);
 
+        $this->_eventManager->dispatch('product_attribute_form_build_main_tab', ['form' => $form]);
+
         return $this;
     }
 

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

@@ -88,7 +88,7 @@ protected function createActionPage($title = null)
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         if ($this->getRequest()->getParam('popup')) {
-            if ($this->getRequest()->getParam('product_tab') == 'variations') {
+            if ($this->getRequest()->getParam('product_tab') === 'variations') {
                 $resultPage->addHandle(['popup', 'catalog_product_attribute_edit_product_tab_variations_popup']);
             } else {
                 $resultPage->addHandle(['popup', 'catalog_product_attribute_edit_popup']);

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

@@ -16,7 +16,7 @@ class StockDataFilter
     /**
      * The greatest value which could be stored in CatalogInventory Qty field
      */
-    const MAX_QTY_VALUE = 99999999.9999;
+    const MAX_QTY_VALUE = 99999999;
 
     /**
      * @var ScopeConfigInterface

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

@@ -142,11 +142,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $optionInstance;
 
-    /**
-     * @var bool
-     */
-    protected $optionsInitialized = false;
-
     /**
      * @var array
      */
@@ -1901,6 +1896,7 @@ public function addOption(Product\Option $option)
     {
         $options = (array)$this->getData('options');
         $options[] = $option;
+        $option->setProduct($this);
         $this->setData('options', $options);
         return $this;
     }

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

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Model\Product\Attribute;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Catalog\Api\AttributeSetFinderInterface;
+use Magento\Framework\DB\Select;
+
+class AttributeSetFinder implements AttributeSetFinderInterface
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $productCollectionFactory;
+
+    /**
+     * @param CollectionFactory $productCollectionFactory
+     */
+    public function __construct(CollectionFactory $productCollectionFactory)
+    {
+        $this->productCollectionFactory = $productCollectionFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function findAttributeSetIdsByProductIds(array $productIds)
+    {
+        /** @var $collection Collection */
+        $collection = $this->productCollectionFactory->create();
+        $select = $collection
+            ->getSelect()
+            ->reset(Select::COLUMNS)
+            ->columns(ProductInterface::ATTRIBUTE_SET_ID)
+            ->where('entity_id IN (?)', $productIds)
+            ->group(ProductInterface::ATTRIBUTE_SET_ID);
+        $result = $collection->getConnection()->fetchCol($select);
+        return $result;
+    }
+}

app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/AttributeSetFinderTest.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ *
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Test\Unit\Model\Product\Attribute;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product\Attribute\AttributeSetFinder;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class AttributeSetFinderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $productCollection;
+
+    /**
+     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $productCollectionFactory;
+
+    /**
+     * @var AttributeSetFinder
+     */
+    protected $attributeSetFinder;
+
+    protected function setUp()
+    {
+        $this->productCollection = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->productCollectionFactory = $this->getMockBuilder(CollectionFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->productCollectionFactory->expects($this->once())->method('create')->willReturn($this->productCollection);
+
+        $this->attributeSetFinder = (new ObjectManager($this))->getObject(
+            AttributeSetFinder::class,
+            [
+                'productCollectionFactory' => $this->productCollectionFactory,
+            ]
+        );
+    }
+
+    public function testFindAttributeIdsByProductIds()
+    {
+        $productIds = [1, 2, 3];
+        $attributeSetIds = [3, 4, 6];
+
+        $select = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $select->expects($this->once())->method('reset')->with(Select::COLUMNS)->willReturnSelf();
+        $select->expects($this->once())->method('columns')->with(ProductInterface::ATTRIBUTE_SET_ID)->willReturnSelf();
+        $select->expects($this->once())->method('where')->with('entity_id IN (?)', $productIds)->willReturnSelf();
+        $select->expects($this->once())->method('group')->with(ProductInterface::ATTRIBUTE_SET_ID)->willReturnSelf();
+
+        $connection = $this->getMock(AdapterInterface::class);
+        $connection->expects($this->once())->method('fetchCol')->with($select)->willReturn($attributeSetIds);
+
+        $this->productCollection->expects($this->once())->method('getSelect')->willReturn($select);
+        $this->productCollection->expects($this->once())->method('getConnection')->willReturn($connection);
+
+        $this->assertEquals($attributeSetIds, $this->attributeSetFinder->findAttributeSetIdsByProductIds($productIds));
+    }
+}