fix corner case when a getAttribute is called on an empty Model and the code tried to fetch the relation instead of returning null it threw when returnNullOnInvalidColumnAttributeAccess = false

Author: Admin

src/Models/BaseModel.php

@@ -333,6 +333,23 @@ public function shouldReturnNullOnInvalidColumnAttributeAccess(): bool
         return $this->returnNullOnInvalidColumnAttributeAccess;
     }
 
+    /**
+     * @inheritdoc
+     * @throws \Exception
+     */
+    public function getAttribute($key): mixed
+    {
+        if ((string)$key === '') {
+            return null;
+        }
+
+        if (\in_array($key, $this->getColumns(), true)) {
+            return $this->getAttributeValue($key);
+        }
+
+        return parent::getAttribute($key);
+    }
+
     /**
      * @inheritDoc
      * @throws \Exception
@@ -397,29 +414,17 @@ public function attributeOffsetExists(string $offset): bool
      */
     public function getRelationValue($key): mixed
     {
-        // If the key already exists in the relationships array, it just means the
-        // relationship has already been loaded, so we'll just return it out of
-        // here because there is no need to query within the relations twice.
-        if ($this->relationLoaded($key)) {
-            return $this->relations[$key];
-        }
-
-        if (!$this->isRelation($key)) {
-            if (!$this->returnNullOnInvalidColumnAttributeAccess) {
-                throw new \Exception('Undefined relation: ' . $key . ' in model: ' . static::class);
-            }
+        $value = parent::getRelationValue($key);
 
-            return null;
-        }
-
-        if ($this->preventsLazyLoading) {
-            $this->handleLazyLoadingViolation($key);
+        if (
+            $value === null
+            && !$this->isRelation($key)
+            && !$this->returnNullOnInvalidColumnAttributeAccess
+        ) {
+            throw new \Exception('Undefined relation: ' . $key . ' in model: ' . static::class);
         }
 
-        // If the "attribute" exists as a method on the model, we will just assume
-        // it is a relationship and will load and return results from the query
-        // and hydrate the relationship's value on the "relationships" array.
-        return $this->getRelationshipFromMethod($key);
+        return $value;
     }
 
     /**