Merge branch '2.4-develop' into ACP2E-4156

soklymeach · soklymeach · commit 4eea4daffc17 · 2025-09-11T12:01:41.000-05:00
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -266,9 +266,10 @@ public function retrieveAttribute($attributeCode, $attributeSet)
     protected function _getProductAttributes($attrSetData)
     {
         if (is_array($attrSetData)) {
-            return $this->_attributes[$attrSetData[Product::COL_ATTR_SET]];
+            $setName = $attrSetData[Product::COL_ATTR_SET] ?? null;
+            return $setName !== null && isset($this->_attributes[$setName]) ? $this->_attributes[$setName] : [];
         } else {
-            return $this->_attributes[$attrSetData];
+            return isset($this->_attributes[$attrSetData]) ? $this->_attributes[$attrSetData] : [];
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -266,9 +266,10 @@ public function retrieveAttribute($attributeCode, $attributeSet)`
`266`	`266`	`protected function _getProductAttributes($attrSetData)`
`267`	`267`	`{`
`268`	`268`	`if (is_array($attrSetData)) {`
`269`		`- return $this->_attributes[$attrSetData[Product::COL_ATTR_SET]];`
	`269`	`+ $setName = $attrSetData[Product::COL_ATTR_SET] ?? null;`
	`270`	`+ return $setName !== null && isset($this->_attributes[$setName]) ? $this->_attributes[$setName] : [];`
`270`	`271`	`} else {`
`271`		`- return $this->_attributes[$attrSetData];`
	`272`	`+ return isset($this->_attributes[$attrSetData]) ? $this->_attributes[$attrSetData] : [];`
`272`	`273`	`}`
`273`	`274`	`}`
`274`	`275`