Merge remote-tracking branch 'origin/2.1-develop' into MAGETWO-84432-magento-magento2-12368

* origin/2.1-develop:
  Duplicate array key
  MAGETWO-84822: Mock ObjectManager for each test to keep from failing when run individually but not as part of suite
  MAGETWO-69577: [Backport for 2.1.x] Auto-generated classes behave differently in unit tests and application
  Fixed static tests failure
  Fixed static tests and backported unit test
  Generate new FormKey and replace for oldRequestParams
  MAGETWO-69213: [Backport] - Braintree saved credit card error for reorder between $2001-$3000 does not display error to customer - for 2.1
  #10765 add confirmation and lock_expires labels to customer grid CSV export
  # This is a combination of 3 commits. # This is the 1st commit message: #10765 add confirmation and lock_expires labels to customer grid CSV export
  MAGETWO-69213: [Backport] - Braintree saved credit card error for reorder between $2001-$3000 does not display error to customer - for 2.1
  Update Ajax LoginTest
  Clear `mage-cache-sessid` on Ajax Login
  9768: Admin dashboard Most Viewed Products Tab only gives default attribute set's products(backport for 2.1)
  10210: Transport variable can not be altered in email_invoice_set_template_vars_before Event (backport MAGETWO-69482 to 2.1)
  [Backport 2.1] add swatch option: prevent loosing data and default value if data is not populated via adminhtml
  Fix to dont show current date in empty date attr
  backport 2.1

Author: osrecio

app/autoload.php

@@ -35,6 +35,3 @@
 }
 
 AutoloaderRegistry::registerAutoloader(new ClassLoaderWrapper($composerAutoloader));
-
-// Sets default autoload mappings, may be overridden in Bootstrap::create
-\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);

app/bootstrap.php

@@ -28,6 +28,9 @@
 }
 
 require_once __DIR__ . '/autoload.php';
+// Sets default autoload mappings, may be overridden in Bootstrap::create
+\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);
+
 require_once BP . '/app/functions.php';
 
 /* Custom umask value may be provided in optional mage_umask file in root */

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js

@@ -36,6 +36,8 @@ define(
                 braintreeDeviceData: null,
                 paymentMethodNonce: null,
                 lastBillingAddress: null,
+                ccCode: null,
+                ccMessageContainer: null,
                 validatorManager: validatorManager,
                 code: 'braintree',
 
@@ -138,9 +140,39 @@ define(
                     return;
                 }
 
+                this.restoreMessageContainer();
+                this.restoreCode();
+
+                /**
+                 * Define onReady callback
+                 */
+                braintree.onReady = function () {};
                 this.initBraintree();
             },
 
+            /**
+             * Restore original message container for cc-form component
+             */
+            restoreMessageContainer: function () {
+                this.messageContainer = this.ccMessageContainer;
+            },
+
+            /**
+             * Restore original code for cc-form component
+             */
+            restoreCode: function () {
+                this.code = this.ccCode;
+            },
+
+            /** @inheritdoc */
+            initChildren: function () {
+                this._super();
+                this.ccMessageContainer = this.messageContainer;
+                this.ccCode = this.code;
+
+                return this;
+            },
+
             /**
              * Init config
              */

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/vault.js

@@ -52,7 +52,7 @@ define([
             var self = this;
 
             /**
-             * Define already callback
+             * Define onReady callback
              */
             Braintree.onReady = function () {
                 self.getPaymentMethodNonce();
@@ -78,6 +78,7 @@ define([
                         formComponent.setPaymentMethodNonce(response.paymentMethodNonce);
                         formComponent.additionalData['public_hash'] = self.publicHash;
                         formComponent.code = self.code;
+                        formComponent.messageContainer = self.messageContainer;
                         formComponent.placeOrder();
                     });
                 })

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php

@@ -143,7 +143,6 @@ public function getExtendedElement($switchAttributeCode)
             [
                 'name' => "product[{$switchAttributeCode}]",
                 'values' => $this->getOptions(),
-                'value' => $switchAttributeCode,
                 'class' => 'required-entry next-toinput',
                 'no_span' => true,
                 'disabled' => $this->isDisabledField(),

app/code/Magento/Catalog/Block/Product/View/Attributes.php

@@ -81,8 +81,9 @@ public function getAdditionalData(array $excludeAttr = [])
         $attributes = $product->getAttributes();
         foreach ($attributes as $attribute) {
             if ($attribute->getIsVisibleOnFront() && !in_array($attribute->getAttributeCode(), $excludeAttr)) {
-                $value = $attribute->getFrontend()->getValue($product);
-
+                if (is_array($value = $attribute->getFrontend()->getValue($product))) {
+                    continue;
+                }
                 if (!$product->hasData($attribute->getAttributeCode())) {
                     $value = __('N/A');
                 } elseif ((string)$value == '') {

app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/AfterProductLoadTest.php

@@ -52,7 +52,7 @@ protected function setUp()
             ->with($productId)
             ->willReturn($stockItemMock);
 
-        $this->productExtensionMock = $this->getMockBuilder('\Magento\Catalog\Api\Data\ProductExtension')
+        $this->productExtensionMock = $this->getMockBuilder('\Magento\Catalog\Api\Data\ProductExtensionInterface')
             ->setMethods(['setStockItem'])
             ->getMock();
         $this->productExtensionMock->expects($this->once())

app/code/Magento/Customer/Controller/Ajax/Login.php

@@ -13,6 +13,8 @@
 use Magento\Customer\Model\Account\Redirect as AccountRedirect;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
+use Magento\Framework\Stdlib\CookieManagerInterface;
 
 /**
  * Login controller
@@ -58,6 +60,16 @@ class Login extends \Magento\Framework\App\Action\Action
      */
     protected $scopeConfig;
 
+    /**
+     * @var CookieManagerInterface
+     */
+    private $cookieManager;
+
+    /**
+     * @var CookieMetadataFactory
+     */
+    private $cookieMetadataFactory;
+
     /**
      * Initialize Login controller
      *
@@ -67,21 +79,29 @@ class Login extends \Magento\Framework\App\Action\Action
      * @param AccountManagementInterface $customerAccountManagement
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     * @param CookieManagerInterface $cookieManager
+     * @param CookieMetadataFactory $cookieMetadataFactory
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Framework\Json\Helper\Data $helper,
         AccountManagementInterface $customerAccountManagement,
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+        CookieManagerInterface $cookieManager = null,
+        CookieMetadataFactory $cookieMetadataFactory = null
     ) {
         parent::__construct($context);
         $this->customerSession = $customerSession;
         $this->helper = $helper;
         $this->customerAccountManagement = $customerAccountManagement;
         $this->resultJsonFactory = $resultJsonFactory;
         $this->resultRawFactory = $resultRawFactory;
+        $this->cookieManager = $cookieManager ?:
+            ObjectManager::getInstance()->get(CookieManagerInterface::class);
+        $this->cookieMetadataFactory = $cookieMetadataFactory ?:
+            ObjectManager::getInstance()->get(CookieMetadataFactory::class);
     }
 
     /**
@@ -169,6 +189,11 @@ public function execute()
             $this->customerSession->setCustomerDataAsLoggedIn($customer);
             $this->customerSession->regenerateId();
             $redirectRoute = $this->getAccountRedirect()->getRedirectCookie();
+            if ($this->cookieManager->getCookie('mage-cache-sessid')) {
+                $metadata = $this->cookieMetadataFactory->createCookieMetadata();
+                $metadata->setPath('/');
+                $this->cookieManager->deleteCookie('mage-cache-sessid', $metadata);
+            }
             if (!$this->getScopeConfig()->getValue('customer/startup/redirect_dashboard') && $redirectRoute) {
                 $response['redirectUrl'] = $this->_redirect->success($redirectRoute);
                 $this->getAccountRedirect()->clearRedirectCookie();

app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Model\Plugin;
+
+use Magento\Customer\Model\Session;
+use Magento\Framework\Data\Form\FormKey as DataFormKey;
+use \Magento\Framework\Event\Observer;
+use Magento\PageCache\Observer\FlushFormKey;
+
+class CustomerFlushFormKey
+{
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @var DataFormKey
+     */
+    private $dataFormKey;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param Session $session
+     * @param DataFormKey $dataFormKey
+     */
+    public function __construct(Session $session, DataFormKey $dataFormKey)
+    {
+        $this->session = $session;
+        $this->dataFormKey = $dataFormKey;
+    }
+
+    /**
+     * @param FlushFormKey $subject
+     * @param callable $proceed
+     * @param Observer $observer
+     * @return void
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundExecute(FlushFormKey $subject, callable $proceed, Observer $observer)
+    {
+        $currentFormKey = $this->dataFormKey->getFormKey();
+        $proceed($observer);
+        $beforeParams = $this->session->getBeforeRequestParams();
+        if ($beforeParams['form_key'] == $currentFormKey) {
+            $beforeParams['form_key'] = $this->dataFormKey->getFormKey();
+            $this->session->setBeforeRequestParams($beforeParams);
+        }
+    }
+}

app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php

@@ -73,6 +73,21 @@ class LoginTest extends \PHPUnit_Framework_TestCase
      */
     protected $redirectMock;
 
+    /**
+     * @var \Magento\Framework\Stdlib\CookieManagerInterface| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $cookieManager;
+
+    /**
+     * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $cookieMetadataFactory;
+
+    /**
+     * @var \Magento\Framework\Stdlib\Cookie\CookieMetadata| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $cookieMetadata;
+
     protected function setUp()
     {
         $this->request = $this->getMockBuilder('Magento\Framework\App\Request\Http')
@@ -105,14 +120,13 @@ protected function setUp()
             '',
             false
         );
-        $this->customerAccountManagementMock =
-            $this->getMock(
-                '\Magento\Customer\Model\AccountManagement',
-                ['authenticate'],
-                [],
-                '',
-                false
-            );
+        $this->customerAccountManagementMock = $this->getMock(
+            '\Magento\Customer\Model\AccountManagement',
+            ['authenticate'],
+            [],
+            '',
+            false
+        );
 
         $this->jsonHelperMock = $this->getMock(
             '\Magento\Framework\Json\Helper\Data',
@@ -130,6 +144,16 @@ protected function setUp()
             ->setMethods(['create'])
             ->getMock();
 
+        $this->cookieManager = $this->getMockBuilder(\Magento\Framework\Stdlib\CookieManagerInterface::class)
+            ->setMethods(['getCookie', 'deleteCookie'])
+            ->getMockForAbstractClass();
+        $this->cookieMetadataFactory = $this->getMockBuilder(\Magento\Framework\Stdlib\Cookie\CookieMetadataFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->cookieMetadata = $this->getMockBuilder(\Magento\Framework\Stdlib\Cookie\CookieMetadata::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->resultRaw = $this->getMockBuilder('Magento\Framework\Controller\Result\Raw')
             ->disableOriginalConstructor()
             ->getMock();
@@ -158,6 +182,8 @@ protected function setUp()
                 'resultJsonFactory' => $this->resultJsonFactory,
                 'objectManager' => $this->objectManager,
                 'customerAccountManagement' => $this->customerAccountManagementMock,
+                'cookieManager' => $this->cookieManager,
+                'cookieMetadataFactory' => $this->cookieMetadataFactory
             ]
         );
     }
@@ -209,6 +235,22 @@ public function testLogin()
         $this->object->setAccountRedirect($redirectMock);
         $redirectMock->expects($this->once())->method('getRedirectCookie')->willReturn('some_url1');
 
+        $this->cookieManager->expects($this->once())
+            ->method('getCookie')
+            ->with('mage-cache-sessid')
+            ->willReturn(true);
+        $this->cookieMetadataFactory->expects($this->once())
+            ->method('createCookieMetadata')
+            ->willReturn($this->cookieMetadata);
+        $this->cookieMetadata->expects($this->once())
+            ->method('setPath')
+            ->with('/')
+            ->willReturnSelf();
+        $this->cookieManager->expects($this->once())
+            ->method('deleteCookie')
+            ->with('mage-cache-sessid', $this->cookieMetadata)
+            ->willReturnSelf();
+
         $scopeConfigMock = $this->getMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
         $this->object->setScopeConfig($scopeConfigMock);
         $scopeConfigMock->expects($this->once())->method('getValue')