Merge remote-tracking branch 'remotes/origin/MAGETWO-52015' into PR-4

Author: aohorodnyk

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/Block/Product/ListProduct.php

@@ -122,6 +122,7 @@ protected function _getProductCollection()
                 }
             }
             $this->_productCollection = $layer->getProductCollection();
+            $this->_productCollection->addOptionsToResult();
 
             $this->prepareSortableFieldsByCategory($layer->getCurrentCategory());
 

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/Eav/Model/ResourceModel/CreateHandler.php

@@ -14,6 +14,7 @@
 
 /**
  * Class CreateHandler
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CreateHandler implements AttributeInterface
 {
@@ -87,6 +88,7 @@ protected function getAttributes($entityType)
      * @return array
      * @throws \Exception
      * @throws \Magento\Framework\Exception\ConfigurationMismatchException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entityData, $arguments = [])
     {
@@ -100,6 +102,7 @@ public function execute($entityType, $entityData, $arguments = [])
                     continue;
                 }
                 if (isset($entityData[$attribute->getAttributeCode()])
+                    && !is_array($entityData[$attribute->getAttributeCode()])
                     && !$attribute->isValueEmpty($entityData[$attribute->getAttributeCode()])
                 ) {
                     $this->attributePersistor->registerInsert(