Merge branch '12.x' into fix/attribute-accessor-arrayable

Author: elliota43

src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php

@@ -42,6 +42,7 @@
 use ReflectionNamedType;
 use RuntimeException;
 use Stringable;
+use Throwable;
 use ValueError;
 
 use function Illuminate\Support\enum_value;
@@ -221,8 +222,11 @@ public function attributesToArray()
             $attributes = $this->getArrayableAttributes()
         );
 
-        // Important: derive mutated attributes *only* from the arrayable keys
-        $mutatedAttributes = $this->getArrayableMutatedAttributes($attributes);
+        $mutatedAttributes = array_values(
+            array_filter(array_keys($attributes), function ($key) {
+                return $this->hasAnyGetMutator($key);
+            })
+        );
 
         $attributes = $this->addMutatedAttributesToArray(
             $attributes, $mutatedAttributes
@@ -690,7 +694,13 @@ public function hasAttributeGetMutator($key)
             return static::$getAttributeMutatorCache[get_class($this)][$key] = false;
         }
 
-        return static::$getAttributeMutatorCache[get_class($this)][$key] = is_callable($this->{Str::camel($key)}()->get);
+        try {
+            $attribute = $this->{Str::camel($key)}();
+
+            return static::$getAttributeMutatorCache[get_class($this)][$key] = is_callable($attribute->get);
+        } catch (Throwable $e) {
+            return static::$getAttributeMutatorCache[get_class($this)][$key] = false;
+        }
     }
 
     /**
@@ -755,8 +765,7 @@ protected function mutateAttributeForArray($key, $value)
     {
         if ($this->isClassCastable($key)) {
             $value = $this->getClassCastableAttributeValue($key, $value);
-        } elseif (isset(static::$getAttributeMutatorCache[get_class($this)][$key]) &&
-                  static::$getAttributeMutatorCache[get_class($this)][$key] === true) {
+        } elseif ($this->hasAttributeGetMutator($key)) {
             $value = $this->mutateAttributeMarkedAttribute($key, $value);
 
             $value = $value instanceof DateTimeInterface
@@ -2440,20 +2449,6 @@ public function getMutatedAttributes()
         return static::$mutatorCache[static::class];
     }
 
-    protected function getArrayableMutatedAttributes(array $attributes): array
-    {
-        $keys = array_keys($attributes);
-
-        if ($keys === []) {
-            return [];
-        }
-
-        // Only consider keys that are actually arrayable *and* have a mutator
-        return array_values(array_filter($keys, function ($key) {
-            return $this->hasAnyGetMutator($key);
-        }));
-    }
-
     /**
      * Extract and cache all the mutated attributes of a class.
      *
@@ -2466,7 +2461,9 @@ public static function cacheMutatedAttributes($classOrInstance)
 
         $class = $reflection->getName();
 
-        static::$getAttributeMutatorCache[$class] = (new Collection($attributeMutatorMethods = static::getAttributeMarkedMutatorMethods($classOrInstance)))
+        $attributeMutatorMethods = static::getAttributeMarkedMutatorMethods($classOrInstance);
+
+        static::$getAttributeMutatorCache[$class] = (new Collection($attributeMutatorMethods))
             ->mapWithKeys(fn ($match) => [
                 lcfirst(static::$snakeAttributes ? Str::snake($match) : $match) => true,
             ])
@@ -2501,18 +2498,14 @@ protected static function getAttributeMarkedMutatorMethods($class)
     {
         $instance = is_object($class) ? $class : new $class;
 
-        return (new Collection((new ReflectionClass($instance))->getMethods()))->filter(function ($method) use ($instance) {
-            $returnType = $method->getReturnType();
-
-            if ($returnType instanceof ReflectionNamedType &&
-                $returnType->getName() === Attribute::class) {
-                if (is_callable($method->invoke($instance)->get)) {
-                    return true;
-                }
-            }
-
-            return false;
-        })->map->name->values()->all();
+        return (new Collection((new ReflectionClass($instance))->getMethods()))
+            ->filter(
+                fn ($method) => $method->getReturnType() instanceof ReflectionNamedType &&
+                    $method->getReturnType()->getName() === Attribute::class)
+            ->map
+            ->name
+            ->values()
+            ->all();
     }