Fix adding an option with label '0'

mbijnsdorp · web-flow · commit 4bb1097650b0 · 2021-11-08T15:27:47.000+01:00
Fix adding an attribute option to a product with the label '0'
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
@@ -93,8 +93,8 @@ public function update(
         if (empty($optionId)) {
             throw new InputException(__('The option id is empty. Enter the value and try again.'));
         }
-        $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.'));
         }
         if ($attribute->getSource()->getOptionText($optionId) === false) {

Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,8 @@ public function update(`
`93`	`93`	`if (empty($optionId)) {`
`94`	`94`	`throw new InputException(__('The option id is empty. Enter the value and try again.'));`
`95`	`95`	`}`
`96`		`- $label = trim($option->getLabel() ?: '');`
`97`		`- if (empty($label)) {`
	`96`	`+ $label = trim((string) $option->getLabel());`
	`97`	`+ if ($label === '') {`
`98`	`98`	`throw new InputException(__('The attribute option label is empty. Enter the value and try again.'));`
`99`	`99`	`}`
`100`	`100`	`if ($attribute->getSource()->getOptionText($optionId) === false) {`