Merge https://github.com/magento/magento2 into develop

Author: thelettuce

app/code/Magento/Braintree/Gateway/Config/Config.php

@@ -72,9 +72,12 @@ public function __construct(
      */
     public function getCountrySpecificCardTypeConfig()
     {
-        $countriesCardTypes = $this->serializer->unserialize($this->getValue(self::KEY_COUNTRY_CREDIT_CARD));
-
-        return is_array($countriesCardTypes) ? $countriesCardTypes : [];
+        $countryCardTypes = $this->getValue(self::KEY_COUNTRY_CREDIT_CARD);
+        if (!$countryCardTypes) {
+            return [];
+        }
+        $countryCardTypes = $this->serializer->unserialize($countryCardTypes);
+        return is_array($countryCardTypes) ? $countryCardTypes : [];
     }
 
     /**

app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php

@@ -89,10 +89,11 @@ public function beforeSave()
      */
     public function afterLoad()
     {
-        $value = $this->serializer->unserialize($this->getValue());
-        if (is_array($value)) {
-            $value = $this->encodeArrayFieldValue($value);
-            $this->setValue($value);
+        if ($this->getValue()) {
+            $value = $this->serializer->unserialize($this->getValue());
+            if (is_array($value)) {
+                $this->setValue($this->encodeArrayFieldValue($value));
+            }
         }
         return $this;
     }

app/code/Magento/Braintree/Test/Unit/Model/Adminhtml/System/Config/CountryCreditCardTest.php

@@ -150,24 +150,30 @@ public function beforeSaveDataProvider()
     }
 
     /**
-     * @dataProvider afterLoadDataProvider
      * @param string $encodedValue
      * @param array|null $value
      * @param array $hashData
      * @param array|null $expected
+     * @param int $unserializeCalledNum
+     * @dataProvider afterLoadDataProvider
      */
-    public function testAfterLoad($encodedValue, $value, array $hashData, $expected)
-    {
+    public function testAfterLoad(
+        $encodedValue,
+        $value,
+        array $hashData,
+        $expected,
+        $unserializeCalledNum = 1
+    ) {
         $this->model->setValue($encodedValue);
         $index = 0;
         foreach ($hashData as $hash) {
-            $this->mathRandomMock->expects(static::at($index))
+            $this->mathRandomMock->expects($this->at($index))
                 ->method('getUniqueHash')
                 ->willReturn($hash);
             $index++;
         }
 
-        $this->serializerMock->expects($this->once())
+        $this->serializerMock->expects($this->exactly($unserializeCalledNum))
             ->method('unserialize')
             ->with($encodedValue)
             ->willReturn($value);
@@ -178,6 +184,7 @@ public function testAfterLoad($encodedValue, $value, array $hashData, $expected)
 
     /**
      * Get data to test saved credit cards types
+     *
      * @return array
      */
     public function afterLoadDataProvider()
@@ -193,7 +200,8 @@ public function afterLoadDataProvider()
                 'encoded' => '',
                 'value' => null,
                 'randomHash' => [],
-                'expected' => null
+                'expected' => null,
+                0
             ],
             'valid data' => [
                 'encoded' => '{"US":["AE","VI","MA"],"AF":["AE","MA"]}',

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

@@ -166,7 +166,7 @@ protected function getBundleSelectionIds(\Magento\Catalog\Model\Product $product
         $customOption = $product->getCustomOption('bundle_selection_ids');
         if ($customOption) {
             $selectionIds = $this->serializer->unserialize($customOption->getValue());
-            if (!empty($selectionIds) && is_array($selectionIds)) {
+            if (is_array($selectionIds) && !empty($selectionIds)) {
                 return $selectionIds;
             }
         }