Use instanceof for more robust type checking in null checks

Copilot · addison74 · Copilot · commit 0b9dc20c2b87 · 2025-12-22T21:36:03.000Z
Co-authored-by: addison74 &lt;8360474+addison74@users.noreply.github.com&gt;
diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php
@@ -54,7 +54,7 @@ public function attachProductChildrenAttributeMapping(array $parentProducts, $st
             $swatchAttributeIds = Mage::helper('configurableswatches')->getSwatchAttributeIds();
         }
 
-        if ($listSwatchAttr && $listSwatchAttr->getId()) {
+        if ($listSwatchAttr instanceof Mage_Eav_Model_Entity_Attribute_Abstract && $listSwatchAttr->getId()) {
             $swatchAttributeIds[] = $listSwatchAttr->getId();
         }
 
@@ -127,7 +127,7 @@ public function attachProductChildrenAttributeMapping(array $parentProducts, $st
                     $mapping[$optionLabel]['default_label'] = $optionLabels[$optionId][0];
                     $mapping[$optionLabel]['labels'] = $optionLabels[$optionId];
 
-                    if ($listSwatchAttr
+                    if ($listSwatchAttr instanceof Mage_Eav_Model_Entity_Attribute_Abstract
                         && $attribute->getAttributeId() == $listSwatchAttr->getAttributeId()
                         && !in_array($mapping[$optionLabel]['label'], $listSwatchValues)
                     ) {

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function attachProductChildrenAttributeMapping(array $parentProducts, $st`
`54`	`54`	`$swatchAttributeIds = Mage::helper('configurableswatches')->getSwatchAttributeIds();`
`55`	`55`	`}`
`56`	`56`
`57`		`- if ($listSwatchAttr && $listSwatchAttr->getId()) {`
	`57`	`+ if ($listSwatchAttr instanceof Mage_Eav_Model_Entity_Attribute_Abstract && $listSwatchAttr->getId()) {`
`58`	`58`	`$swatchAttributeIds[] = $listSwatchAttr->getId();`
`59`	`59`	`}`
`60`	`60`
`@@ -127,7 +127,7 @@ public function attachProductChildrenAttributeMapping(array $parentProducts, $st`
`127`	`127`	`$mapping[$optionLabel]['default_label'] = $optionLabels[$optionId][0];`
`128`	`128`	`$mapping[$optionLabel]['labels'] = $optionLabels[$optionId];`
`129`	`129`
`130`		`- if ($listSwatchAttr`
	`130`	`+ if ($listSwatchAttr instanceof Mage_Eav_Model_Entity_Attribute_Abstract`
`131`	`131`	`&& $attribute->getAttributeId() == $listSwatchAttr->getAttributeId()`
`132`	`132`	`&& !in_array($mapping[$optionLabel]['label'], $listSwatchValues)`
`133`	`133`	`) {`