From e07e762b4897c194b4d823c179becf3a94e218f3 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Tue, 8 May 2018 09:06:23 +0200
Subject: [PATCH] Add statement to 'beforeSave' method to allow
 app:config:import

---
 .../Model/Adminhtml/System/Config/CountryCreditCard.php    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php b/app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php
index f68b7eca047f5..2a9923a333cef 100644
--- a/app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php
+++ b/app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php
@@ -66,6 +66,13 @@ public function __construct(
     public function beforeSave()
     {
         $value = $this->getValue();
+        if (!is_array($value)) {
+            try {
+                $value = $this->serializer->unserialize($value);
+            } catch (\InvalidArgumentException $e) {
+                $value = [];
+            }
+        }
         $result = [];
         foreach ($value as $data) {
             if (empty($data['country_id']) || empty($data['cc_types'])) {