Fixed array_keys(null) and call to undefined method in `Mage_Eav_Mo…

…del_Config` (#4036) Co-authored-by: Sven Reichel <[email protected]>
OpenMage · Jun 29, 2024 · 1d4fe88 · 1d4fe88
1 parent a7a1bd6
commit 1d4fe88
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 23 deletions.
diff --git a/app/code/core/Mage/Eav/Model/Config.php b/app/code/core/Mage/Eav/Model/Config.php
@@ -126,6 +126,9 @@ public function setCurrentStoreId($storeId)
         $this->_currentStoreId = $storeId;
     }
 
+    /**
+     * @throws Mage_Core_Model_Store_Exception
+     */
     protected function _storeId()
     {
         if (isset($this->_currentStoreId) && $this->_currentStoreId !== false) {
@@ -134,6 +137,9 @@ protected function _storeId()
         return Mage::app()->getStore()->getId();
     }
 
+    /**
+     * @throws Exception
+     */
     protected function _initializeStore($storeId = null)
     {
         if ($storeId === null) {
@@ -176,7 +182,6 @@ protected function _initializeStore($storeId = null)
     }
 
     /**
-     * @param $storeId
      * @return void
      * @throws Exception
      */
@@ -216,7 +221,8 @@ protected function _loadEntityTypes()
      */
     protected function _loadEntityAttributes($entityType, $storeId)
     {
-        // preload attributes in array form to avoid instantiating models for every attribute even if it is never accessed
+        // preload attributes in array form to avoid instantiating
+        // models for every attribute even if it is never accessed
         $entityAttributes = $entityType->newAttributeCollection()
             ->addStoreLabel($storeId)
             ->getData();
@@ -346,6 +352,7 @@ protected function _isCacheEnabled()
      *
      * @param array $attributeData
      * @return Mage_Eav_Model_Entity_Attribute_Abstract|false
+     * @throws Mage_Core_Exception
      */
     protected function _hydrateAttribute($attributeData)
     {
@@ -361,7 +368,9 @@ protected function _hydrateAttribute($attributeData)
             $attribute->setData($attributeData);
 
             $entity = $entityType->getEntity();
-            if (in_array($attribute->getAttributeCode(), $entity->getDefaultAttributes())) {
+            if (method_exists($entity, 'getDefaultAttributes')
+                && in_array($attribute->getAttributeCode(), $entity->getDefaultAttributes())
+            ) {
                 $attribute
                     ->setBackendType(Mage_Eav_Model_Entity_Attribute_Abstract::TYPE_STATIC)
                     ->setIsGlobal(1);
@@ -378,10 +387,10 @@ protected function _hydrateAttribute($attributeData)
      * Get entity type object by entity type code/identifier
      *
      * @param mixed $code
-     * @param string|null $code
-     * @param string $field
+     * @param string|null $field
      * @return Mage_Eav_Model_Entity_Type
      * @throws Mage_Core_Exception
+     * @throws Exception
      */
     public function getEntityType($code, $field = null)
     {
@@ -438,16 +447,16 @@ protected function _getDefaultAttributeIfExists($entityType, $attributeCode, $st
         }
 
         $entity = $entityType->getEntity();
-        if (method_exists($entity, 'getDefaultAttributes')) {
-            if (in_array($attributeCode, $entity->getDefaultAttributes())) {
-                $attributeData = [
-                    'entity_type_id' => $entityType->getId(),
-                    'attribute_code' => $attributeCode,
-                ];
-                $attribute = $this->_hydrateAttribute($attributeData);
-                $this->_defaultAttributes[$storeId][$entityType->getId()][$attributeCode] = $attribute;
-                return $attribute;
-            }
+        if (method_exists($entity, 'getDefaultAttributes')
+            && in_array($attributeCode, $entity->getDefaultAttributes())
+        ) {
+            $attributeData = [
+                'entity_type_id' => $entityType->getId(),
+                'attribute_code' => $attributeCode,
+            ];
+            $attribute = $this->_hydrateAttribute($attributeData);
+            $this->_defaultAttributes[$storeId][$entityType->getId()][$attributeCode] = $attribute;
+            return $attribute;
         }
 
         // cache a miss as well
@@ -462,6 +471,8 @@ protected function _getDefaultAttributeIfExists($entityType, $attributeCode, $st
      * @param mixed $code
      * @param int|null $storeId
      * @return Mage_Eav_Model_Entity_Attribute_Abstract|false
+     * @throws Mage_Core_Exception
+     * @throws Exception
      */
     public function getAttribute($entityType, $code, $storeId = null)
     {
@@ -503,6 +514,7 @@ public function getAttribute($entityType, $code, $storeId = null)
     /**
      * @param mixed $entityType
      * @return Mage_Eav_Model_Entity_Attribute_Abstract[]
+     * @throws Mage_Core_Exception
      */
     public function getAttributes($entityType)
     {
@@ -527,6 +539,8 @@ public function getAttributes($entityType)
      * @param Mage_Eav_Model_Entity_Type $entityType
      * @param Varien_Object $object
      * @return array
+     * @throws Mage_Core_Exception
+     * @throws Exception
      */
     public function getEntityAttributeCodes($entityType, $object = null)
     {
@@ -549,7 +563,8 @@ public function getEntityAttributeCodes($entityType, $object = null)
             $attributeCodes = [];
             foreach ($attributeIds as $attributeId) {
                 $attribute = $this->getAttribute($entityType, $attributeId, $storeId);
-                // need to verify attribute actually exists to avoid problems with deleted attributes that left behind some remnants
+                // need to verify attribute actually exists to avoid problems
+                // with deleted attributes that left behind some remnants
                 if ($attribute) {
                     $attributeCodes[] = $attribute->getAttributeCode();
                 }
@@ -563,7 +578,6 @@ public function getEntityAttributeCodes($entityType, $object = null)
     /**
      * @param int|int[] $attributeSetId
      * @return int[]
-     * @throws Mage_Core_Model_Store_Exception
      */
     public function getAttributeSetAttributeIds($attributeSetId)
     {
@@ -588,6 +602,7 @@ public function getAttributeSetAttributeIds($attributeSetId)
      * @param mixed $entityType
      * @param string $attribute
      * @return  Mage_Eav_Model_Entity_Attribute_Abstract|null
+     * @throws Mage_Core_Exception
      * @deprecated Equivalent to getAttribute(...), use getAttribute(...) instead
      * Get attribute object for collection usage
      *

diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php
@@ -33,7 +33,7 @@
  * @method bool getIsConfigurable()
  * @method bool getIsFilterable()
  * @method bool getIsFilterableInSearch()
- * @method bool setIsGlobal()
+ * @method $this setIsGlobal(int $value)
  * @method bool getIsRequired()
  * @method bool getIsSearchable()
  * @method bool getIsUnique()

diff --git a/phpstan.dist.baseline.neon b/phpstan.dist.baseline.neon
@@ -3010,11 +3010,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Eav/Model/Attribute/Data/File.php
 
-		-
-			message: "#^Call to an undefined method Mage_Core_Model_Resource_Abstract\\:\\:getDefaultAttributes\\(\\)\\.$#"
-			count: 1
-			path: app/code/core/Mage/Eav/Model/Config.php
-
 		-
 			message: "#^Method Mage_Eav_Model_Config\\:\\:getAttribute\\(\\) should return Mage_Eav_Model_Entity_Attribute_Abstract\\|false but returns Mage_Eav_Model_Entity_Attribute_Interface\\.$#"
 			count: 1