Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-52321

Author: shiftedreality

app/code/Magento/Braintree/Observer/DataAssignObserver.php

@@ -7,6 +7,7 @@
 
 use Magento\Framework\Event\Observer;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
+use Magento\Quote\Api\Data\PaymentInterface;
 
 /**
  * Class DataAssignObserver
@@ -31,13 +32,19 @@ class DataAssignObserver extends AbstractDataAssignObserver
     public function execute(Observer $observer)
     {
         $data = $this->readDataArgument($observer);
+
+        $additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
+        if (!is_array($additionalData)) {
+            return;
+        }
+
         $paymentInfo = $this->readPaymentModelArgument($observer);
 
         foreach ($this->additionalInformationList as $additionalInformationKey) {
-            if ($data->getDataByKey($additionalInformationKey) !== null) {
+            if (isset($additionalData[$additionalInformationKey])) {
                 $paymentInfo->setAdditionalInformation(
                     $additionalInformationKey,
-                    $data->getDataByKey($additionalInformationKey)
+                    $additionalData[$additionalInformationKey]
                 );
             }
         }

app/code/Magento/Braintree/Test/Unit/Observer/DataAssignObserverTest.php

@@ -10,6 +10,7 @@
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
 use Magento\Braintree\Observer\DataAssignObserver;
+use Magento\Quote\Api\Data\PaymentInterface;
 
 /**
  * Class DataAssignObserverTest
@@ -30,8 +31,10 @@ public function testExecute()
         $paymentInfoModel = $this->getMock(InfoInterface::class);
         $dataObject = new DataObject(
             [
-                'payment_method_nonce' => self::PAYMENT_METHOD_NONCE,
-                'device_data' => self::DEVICE_DATA,
+                PaymentInterface::KEY_ADDITIONAL_DATA => [
+                    'payment_method_nonce' => self::PAYMENT_METHOD_NONCE,
+                    'device_data' => self::DEVICE_DATA
+                ]
             ]
         );
         $observerContainer->expects(static::atLeastOnce())

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php

@@ -419,6 +419,7 @@ protected function getTierPriceStructure($tierPricePath)
                         'dndConfig' => [
                             'enabled' => false,
                         ],
+                        'disabled' => false,
                         'sortOrder' =>
                             $this->arrayManager->get($tierPricePath . '/arguments/data/config/sortOrder', $this->meta),
                     ],

app/code/Magento/Checkout/Model/Cart.php

@@ -257,7 +257,11 @@ public function addOrderItem($orderItem, $qtyFlag = null)
         if ($orderItem->getParentItem() === null) {
             $storeId = $this->_storeManager->getStore()->getId();
             try {
-                $product = $this->productRepository->getById($orderItem->getProductId(), false, $storeId);
+                /**
+                 * We need to reload product in this place, because products
+                 * with the same id may have different sets of order attributes.
+                 */
+                $product = $this->productRepository->getById($orderItem->getProductId(), false, $storeId, true);
             } catch (NoSuchEntityException $e) {
                 return $this;
             }

app/code/Magento/Customer/view/frontend/web/js/password-strength-indicator.js

@@ -6,11 +6,13 @@
 /**
  * jshint browser:true
  */
+/*eslint no-unused-vars: 0*/
 define([
     'jquery',
+    'Magento_Customer/js/zxcvbn',
     'mage/translate',
-    'Magento_Customer/js/zxcvbn'
-], function ($, $t, zxcvbn) {
+    'mage/validation'
+], function ($, zxcvbn, $t, validation) {
     'use strict';
 
     $.widget('mage.passwordStrengthIndicator', {
@@ -50,6 +52,8 @@ define([
                 className = this._getClassName(score);
 
             this._displayStrength(className, score);
+            //update error messages
+            $.validator.validateSingleElement(this.element.find('input[type="password"]'));
         },
 
         /**

app/code/Magento/ImportExport/Model/Export.php

@@ -238,6 +238,9 @@ public static function getStaticAttributeFilterType(\Magento\Eav\Model\Entity\At
             return self::FILTER_TYPE_INPUT;
         }
         $columns = $attribute->getFlatColumns();
+        if (empty($columns)) {
+            return self::FILTER_TYPE_INPUT;
+        }
         switch ($columns[$attribute->getAttributeCode()]['type']) {
             case \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER:
             case \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT:

app/code/Magento/OfflinePayments/Model/Purchaseorder.php

@@ -47,10 +47,6 @@ class Purchaseorder extends \Magento\Payment\Model\Method\AbstractMethod
      */
     public function assignData(\Magento\Framework\DataObject $data)
     {
-        if (!$data instanceof \Magento\Framework\DataObject) {
-            $data = new \Magento\Framework\DataObject($data);
-        }
-
         $this->getInfoInstance()->setPoNumber($data->getPoNumber());
         return $this;
     }

app/code/Magento/Payment/Model/Info.php

@@ -220,9 +220,6 @@ protected function _initAdditionalInformation()
     {
         $additionalInfo = $this->_getData('additional_information');
         if (empty($this->_additionalInformation) && $additionalInfo) {
-            if (!is_array($additionalInfo)) {
-                $additionalInfo = unserialize($additionalInfo);
-            }
             $this->_additionalInformation = $additionalInfo;
         }
     }

app/code/Magento/Payment/Model/Method/AbstractMethod.php

@@ -21,6 +21,7 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated
  */
 abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibleModel implements
     MethodInterface,
@@ -769,12 +770,6 @@ public function getConfigData($field, $storeId = null)
      */
     public function assignData(\Magento\Framework\DataObject $data)
     {
-        if (is_array($data)) {
-            $this->getInfoInstance()->addData($data);
-        } elseif ($data instanceof \Magento\Framework\DataObject) {
-            $this->getInfoInstance()->addData($data->getData());
-        }
-
         $this->_eventManager->dispatch(
             'payment_method_assign_data_' . $this->getCode(),
             [

app/code/Magento/Payment/Test/Unit/Model/InfoTest.php

@@ -90,7 +90,6 @@ public function ccKeysDataProvider()
         ];
     }
 
-
     public function testGetMethodInstanceWithRealMethod()
     {
         $method = 'real_method';
@@ -108,7 +107,6 @@ public function testGetMethodInstanceWithRealMethod()
         $this->info->getMethodInstance();
     }
 
-
     public function testGetMethodInstanceWithUnrealMethod()
     {
         $method = 'unreal_method';
@@ -131,7 +129,6 @@ public function testGetMethodInstanceWithUnrealMethod()
         $this->info->getMethodInstance();
     }
 
-
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @expectedExceptionMessage The payment method you requested is not available.
@@ -141,8 +138,7 @@ public function testGetMethodInstanceWithNoMethod()
         $this->info->setData('method', false);
         $this->info->getMethodInstance();
     }
-
-
+    
     public function testGetMethodInstanceRequestedMethod()
     {
         $code = 'real_method';
@@ -251,9 +247,9 @@ public function testHasAdditionalInformation()
 
     public function testInitAdditionalInformationWithUnserialize()
     {
-        $data = serialize(['key1' => 'data1', 'key2' => 'data2']);
+        $data = ['key1' => 'data1', 'key2' => 'data2'];
         $this->info->setData('additional_information', $data);
 
-        $this->assertEquals(unserialize($data), $this->info->getAdditionalInformation());
+        $this->assertEquals($data, $this->info->getAdditionalInformation());
     }
 }