Apply label change to add method

Mike Bijnsdorp · Mike Bijnsdorp · commit 02f7fa05e04c · 2021-11-10T22:29:28.000+01:00
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
@@ -60,8 +60,8 @@ public function add($entityType, $attributeCode, $option)
     {
         $attribute = $this->loadAttribute($entityType, (string)$attributeCode);
 
-        $label = trim($option->getLabel() ?: '');
-        if (empty($label)) {
+        $label = trim((string) $option->getLabel());
+        if ($label === '') {
             throw new InputException(__('The attribute option label is empty. Enter the value and try again.'));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,8 @@ public function add($entityType, $attributeCode, $option)`
`60`	`60`	`{`
`61`	`61`	`$attribute = $this->loadAttribute($entityType, (string)$attributeCode);`
`62`	`62`
`63`		`- $label = trim($option->getLabel() ?: '');`
`64`		`- if (empty($label)) {`
	`63`	`+ $label = trim((string) $option->getLabel());`
	`64`	`+ if ($label === '') {`
`65`	`65`	`throw new InputException(__('The attribute option label is empty. Enter the value and try again.'));`
`66`	`66`	`}`
`67`	`67`