Update DocumentModel.php;

Author: hans-thomas

src/Eloquent/DocumentModel.php

@@ -11,6 +11,7 @@
 use Illuminate\Contracts\Queue\QueueableCollection;
 use Illuminate\Contracts\Queue\QueueableEntity;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Database\Eloquent\Casts\Json;
 use Illuminate\Database\Eloquent\Concerns\HasAttributes;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
@@ -266,6 +267,16 @@ public function setAttribute($key, $value)
         return parent::setAttribute($key, $value);
     }
 
+    /** @inheritdoc */
+    protected function isJsonCastable($key)
+    {
+        if ($this->hasCast($key, ['array'])) {
+            return false;
+        }
+
+        return parent::isJsonCastable($key);
+    }
+
     /**
      * @param mixed $value
      *
@@ -287,6 +298,15 @@ protected function asDecimal($value, $decimals)
         return parent::asDecimal($value, $decimals);
     }
 
+    public function fromJson($value, $asObject = false)
+    {
+        if (is_array($value)) {
+            return $value;
+        }
+
+        return parent::fromJson($value, $asObject);
+    }
+
     /**
      * Change to mongo native for decimal cast.
      *