10765 code refactoring

magento · Sep 17, 2017 · 404156e · 404156e
1 parent 51e41ac
commit 404156e
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php b/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
@@ -11,6 +11,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -82,13 +83,13 @@ public function __construct(
         GroupRepositoryInterface $groupRepository,
         CustomerMetadataInterface $customerMetadata,
         StoreManagerInterface $storeManager,
-        ScopeConfigInterface $scopeConfig
+        ScopeConfigInterface $scopeConfig = null
     ) {
         parent::__construct($attributeValueFactory);
         $this->customerMetadata = $customerMetadata;
         $this->groupRepository = $groupRepository;
         $this->storeManager = $storeManager;
-        $this->scopeConfig = $scopeConfig;
+        $this->scopeConfig = $scopeConfig ? $scopeConfig : ObjectManager::getInstance()->create(ScopeConfigInterface::class);
     }
 
     /**
@@ -182,9 +183,10 @@ private function setConfirmationValue()
             ScopeInterface::SCOPE_WEBSITES,
             $websiteId);
 
-        $valueText = !$isConfirmationRequired ?
-            __('Confirmation Not Required')
-            : ($value === null ?  __('Confirmed') : __('Confirmation Required'));
+        $valueText = __('Confirmation Not Required');
+        if ($isConfirmationRequired) {
+            $valueText = $value === null ? __('Confirmed') : __('Confirmation Required');
+        }
 
         $this->setCustomAttribute(self::$confirmationAttributeCode, $valueText);
     }