From 74e1d85d4f23802e05c94dde7daeef5b98c2d3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artur=20Jewu=C5=82a?= <artur.jewula@hatimeria.pl>
Date: Sun, 17 Sep 2017 12:00:43 +0200
Subject: [PATCH]  #10765 add confirmation and lock_expires labels to customer
 grid CSV export

---
 .../Test/Unit/Ui/Component/DataProvider/DocumentTest.php     | 1 -
 .../Magento/Customer/Ui/Component/DataProvider/Document.php  | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php
index 84be36f8e0baa..739c9258c1c10 100644
--- a/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php
@@ -188,7 +188,6 @@ public function testGetConfirmationAttribute()
         static::assertEquals('Confirmed', (string)$value);
     }
 
-
     /**
      * @covers \Magento\Customer\Ui\Component\DataProvider\Document::getCustomAttribute
      */
diff --git a/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php b/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
index f76f59b1aee36..7e5f7e445c9c2 100644
--- a/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
+++ b/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
@@ -89,7 +89,7 @@ public function __construct(
         $this->customerMetadata = $customerMetadata;
         $this->groupRepository = $groupRepository;
         $this->storeManager = $storeManager;
-        $this->scopeConfig = $scopeConfig ? $scopeConfig : ObjectManager::getInstance()->create(ScopeConfigInterface::class);
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->create(ScopeConfigInterface::class);
     }
 
     /**
@@ -181,7 +181,8 @@ private function setConfirmationValue()
         $isConfirmationRequired = (bool)$this->scopeConfig->getValue(
             AccountManagement::XML_PATH_IS_CONFIRM,
             ScopeInterface::SCOPE_WEBSITES,
-            $websiteId);
+            $websiteId
+        );
 
         $valueText = __('Confirmation Not Required');
         if ($isConfirmationRequired) {