From adb3af29f2fc435b193338a80d873689cac82a1d Mon Sep 17 00:00:00 2001
From: Arnoud Beekman <arnoud.beekman@mediact.nl>
Date: Sun, 26 Aug 2018 20:41:13 +0200
Subject: [PATCH 1/2] Optimize code to remove phpmd suppress warnings

By making the order of some checks more efficient the suppress warnings
in these two files about CyclomaticComplexity and NPathComplexity.
---
 .../Magento/Customer/Model/Metadata/Form/Text.php   | 11 +++++------
 app/code/Magento/Eav/Model/Attribute/Data/Text.php  | 13 ++++++-------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Text.php b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
index c8b9a1e46a127..dcd3bc93569a4 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Text.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Text.php
@@ -52,8 +52,6 @@ public function extractValue(\Magento\Framework\App\RequestInterface $request)
 
     /**
      * @inheritdoc
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function validateValue($value)
     {
@@ -66,12 +64,12 @@ public function validateValue($value)
             $value = $this->_value;
         }
 
-        if ($attribute->isRequired() && empty($value) && $value !== '0') {
-            $errors[] = __('"%1" is a required value.', $label);
+        if (!$attribute->isRequired() && empty($value)) {
+            return true;
         }
 
-        if (!$errors && !$attribute->isRequired() && empty($value)) {
-            return true;
+        if (empty($value) && $value !== '0') {
+            $errors[] = __('"%1" is a required value.', $label);
         }
 
         $errors = $this->validateLength($value, $attribute, $errors);
@@ -80,6 +78,7 @@ public function validateValue($value)
         if ($result !== true) {
             $errors = array_merge($errors, $result);
         }
+
         if (count($errors) == 0) {
             return true;
         }
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Text.php b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
index f81fb2affd3b3..a26a92df385f2 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Text.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
@@ -55,8 +55,7 @@ public function extractValue(RequestInterface $request)
      *
      * @param array|string $value
      * @return bool|array
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function validateValue($value)
     {
@@ -68,13 +67,13 @@ public function validateValue($value)
             $value = $this->getEntity()->getDataUsingMethod($attribute->getAttributeCode());
         }
 
-        if ($attribute->getIsRequired() && empty($value) && $value !== '0') {
-            $label = __($attribute->getStoreLabel());
-            $errors[] = __('"%1" is a required value.', $label);
+        if (!$attribute->isRequired() && empty($value)) {
+            return true;
         }
 
-        if (!$errors && !$attribute->getIsRequired() && empty($value)) {
-            return true;
+        if (empty($value) && $value !== '0') {
+            $label = __($attribute->getStoreLabel());
+            $errors[] = __('"%1" is a required value.', $label);
         }
 
         $result = $this->validateLength($attribute, $value);

From f5b496c2a033b48e8669db81b421f16240c359d0 Mon Sep 17 00:00:00 2001
From: Arnoud Beekman <arnoud.beekman@mediact.nl>
Date: Sat, 13 Oct 2018 15:05:44 +0200
Subject: [PATCH 2/2] Use the correct method to validate if attribute is
 required

---
 app/code/Magento/Eav/Model/Attribute/Data/Text.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Text.php b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
index a26a92df385f2..a919a54cf6289 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Text.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
@@ -67,7 +67,7 @@ public function validateValue($value)
             $value = $this->getEntity()->getDataUsingMethod($attribute->getAttributeCode());
         }
 
-        if (!$attribute->isRequired() && empty($value)) {
+        if (!$attribute->getIsRequired() && empty($value)) {
             return true;
         }