ACPT-1544

making requested change for websiteId when attribute isn't website-specific

Author: JacobBrownAustin

app/code/Magento/Eav/Model/Config.php

@@ -73,7 +73,7 @@ class Config implements ResetAfterRequestInterface
      * Initialized attributes
      *
      * [int $website][string $entityTypeCode][string $code] = AbstractAttribute $attribute
-     * @var array<int|null, array<string, array<string, AbstractAttribute>>>
+     * @var array<int, array<string, array<string, AbstractAttribute>>>
      */
     private $attributes;
 
@@ -255,7 +255,7 @@ private function loadAttributes($entityTypeCode)
         if ($this->isAttributeTypeWebsiteSpecific($entityTypeCode)) {
             $websiteId = $this->getWebsiteId();
         } else {
-            $websiteId = null;
+            $websiteId = 0;
         }
         return $this->attributes[$websiteId][$entityTypeCode] ?? [];
     }
@@ -286,7 +286,7 @@ private function saveAttribute(AbstractAttribute $attribute, $entityTypeCode, $a
         if ($this->isAttributeTypeWebsiteSpecific($entityTypeCode)) {
             $websiteId = $this->getWebsiteId();
         } else {
-            $websiteId = null;
+            $websiteId = 0;
         }
         $this->attributes[$websiteId][$entityTypeCode][$attributeCode] = $attribute;
     }
@@ -559,7 +559,7 @@ public function getAttribute($entityType, $code)
         if ($this->isAttributeTypeWebsiteSpecific($entityType)) {
             $websiteId = $this->getWebsiteId();
         } else {
-            $websiteId = null;
+            $websiteId = 0;
         }
         if ($code instanceof \Magento\Eav\Model\Entity\Attribute\AttributeInterface) {
             return $code;