Merge pull request #1942 from ridaamirini/8.0

[8.0] Keep casted attributes #1747
yajra · Jan 4, 2019 · cfd0599 · cfd0599
2 parents 4e9a1d2 + 83138f3
commit cfd0599
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Processors/DataProcessor.php b/src/Processors/DataProcessor.php
@@ -232,7 +232,11 @@ protected function escapeColumns(array $output)
             } elseif (is_array($this->escapeColumns)) {
                 $columns = array_diff($this->escapeColumns, $this->rawColumns);
                 foreach ($columns as $key) {
-                    array_set($row, $key, e(array_get($row, $key)));
+                    $data = array_get($row, $key);
+                    $dataType = gettype($data);
+                    $data = e($data);
+                    settype($data, $dataType);
+                    array_set($row, $key, $data);
                 }
             }
 
@@ -251,7 +255,9 @@ protected function escapeRow(array $row)
         $arrayDot = array_filter(array_dot($row));
         foreach ($arrayDot as $key => $value) {
             if (! in_array($key, $this->rawColumns)) {
+                $dataType       = gettype($value);
                 $arrayDot[$key] = e($value);
+                settype($arrayDot[$key], $dataType);
             }
         }
 

diff --git a/src/Utilities/Helper.php b/src/Utilities/Helper.php
@@ -155,7 +155,9 @@ public static function getOrMethod($method)
      */
     public static function convertToArray($row)
     {
-        $data = $row instanceof Arrayable ? $row->toArray() : (array) $row;
+        $data = $row instanceof Arrayable ?
+                $row->toArray() :
+                ($row instanceof \StdClass ? (array) $row : $row);
 
         foreach ($data as &$value) {
             if (is_object($value) || is_array($value)) {