Prefer castFrom* methods over __toString

tillkruss · tillkruss · commit 65c2f0a37104 · 2017-03-25T10:56:25.000-07:00
diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php b/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php
@@ -568,9 +568,9 @@ protected function mergeAttributesFromClassCasts()
                 $attributeCount = count($attributes);
                 $object = $this->castToClass($attribute);
 
-                $castedAttributes = method_exists($object, '__toString')
-                    ? (string) $object
-                    : $this->{'castFrom'.Str::studly($type)}($object);
+                $castedAttributes = method_exists($this, 'castFrom'.Str::studly($type))
+                    ? $this->{'castFrom'.Str::studly($type)}($object)
+                    : $object->__toString();
 
                 if ($attributeCount !== count($castedAttributes)) {
                     throw new LogicException("Class cast {$attribute} must return {$attributeCount} attributes");
