fixed: deep clone issue

Author: nahid

composer.json

@@ -12,7 +12,8 @@
         }
     ],
   "require": {
-    "php": ">=5.5.0"
+    "php": ">=5.5.0",
+        "myclabs/deep-copy": "^1.8"
   },
   "require-dev": {
         "phpunit/phpunit": "^4.8 || ^5.0",

data.csv

@@ -0,0 +1,6 @@
+id,name,cat,price
+1,iPhone,1,80000
+2,macbook pro,2,150000
+3,Redmi 3S Prime,1,12000
+4,Redmi 4X,1,15000
+5,macbook air,2,110000

src/Queriable.php

@@ -281,7 +281,11 @@ protected function prepareResult($data)
 
         if ($this->isMultiArray($data)) {
             foreach ($data as $key => $val) {
-                $output[$key] = $this->instanceWithValue($val, ['_select' => $this->_select, '_except' => $this->_except]);
+                if (is_array($val)) {
+                    $output[$key] = $this->instanceWithValue($val, ['_select' => $this->_select, '_except' => $this->_except]);
+                } else {
+                    $output[$key] = $val;
+                }
             }
         } else {
             $value = json_decode(json_encode($this->takeColumn($data)), true);
@@ -302,8 +306,8 @@ protected function prepareResult($data)
      */
     protected function instanceWithValue($value, $meta = [])
     {
-        $this->fresh($meta);
         $instance = $this->copy();
+        $instance->fresh($meta);
         $value = $instance->takeColumn($value);
         return $instance->collect($value);
     }

src/QueryEngine.php

@@ -4,6 +4,7 @@
 
 use Nahid\QArray\Exceptions\ConditionNotAllowedException;
 use Nahid\QArray\Exceptions\NullValueException;
+use function DeepCopy\deep_copy;
 
 abstract class QueryEngine implements \Countable, \Iterator
 {
@@ -128,8 +129,7 @@ public function copy($fresh = false)
         if ($fresh) {
             $this->fresh();
         }
-
-        return clone $this;
+        return deep_copy($this);
     }
 
     /**
@@ -240,8 +240,12 @@ public function get($column = [])
         }
 
         $this->prepare();
+        $prepare = $this->prepareResult($this->_map);
+
+        $result = $prepare->reset($prepare->_map, true);
+        $this->collect($this->_baseContents);
 
-        return $this->prepareResult($this->_map);
+        return $result;
     }
 
     /**
@@ -304,18 +308,18 @@ public function exists()
      */
     public function reset($data = null, $fresh = false)
     {
-        if (!is_null($data)) {
-            $this->_baseContents = $data;
-        }
 
         if ($fresh) {
-            $self = $this->copy($fresh);
-            $self->collect($this->_baseContents);
+            $self = new static();
+            $self->collect($data);
 
             return $self;
         }
 
-        $this->_map = $this->_baseContents;
+        if (!is_null($data)) {
+            $this->collect($data);
+        }
+
         $this->reProcess();
 
         return $this;
@@ -500,7 +504,11 @@ public function first($column = [])
         }
 
         if (count($data) > 0) {
-            return $this->prepareResult(reset($data));
+            $prepare = $this->prepareResult(reset($data));
+            $result = $prepare->reset($prepare->_map, true);
+            $this->collect($this->_baseContents);
+
+            return $result;
         }
 
         return null;
@@ -521,7 +529,11 @@ public function last($column = [])
         $this->_select = $column;
 
         if (count($data) > 0) {
-            return $this->prepareResult(end($data));
+            $prepare = $this->prepareResult(end($data));
+            $result = $prepare->reset($prepare->_map, true);
+            $this->collect($this->_baseContents);
+
+            return $result;
         }
 
         return null;
@@ -554,7 +566,12 @@ public function nth($index, $column = [])
             $result = $data[$this->count() + $index];
         }
 
-        return $this->prepareResult($result);
+        $prepare = $this->prepareResult($result);
+        $result = $prepare->reset($prepare->_map, true);
+        $this->collect($this->_baseContents);
+
+        return $result;
+
     }
 
     /**
@@ -666,7 +683,11 @@ public function transform(callable $fn)
             $new_data[$key] = $fn($val);
         }
 
-        return $this->prepareResult($new_data, false);
+        $prepare = $this->prepareResult($new_data, false);
+        $result = $prepare->reset($prepare->_map, true);
+        $this->collect($this->_baseContents);
+
+        return $result;
     }
 
     /**
@@ -715,7 +736,12 @@ public function filter(callable $fn, $key = false)
             }
         }
 
-        return $this->prepareResult($data, false);
+        $prepare = $this->prepareResult($data, false);
+        $result = $prepare->reset($prepare->_map, true);
+        $this->collect($this->_baseContents);
+
+        return $result;
+
     }
 
     /**
@@ -761,8 +787,9 @@ public function json($data)
     public function collect($data)
     {
         $data = $this->objectToArray($data);
-        $this->_map = $data;
-        $this->_baseContents = $data;
+        $this->_map = deep_copy($data);
+        $this->_baseContents = deep_copy($data);
+        $this->_isProcessed = false;
 
         return $this;
     }
@@ -837,7 +864,7 @@ public function toJson()
     {
         $this->prepare();
 
-        return json_encode($this->_map);
+        return json_encode($this->toArray());
     }
 
     /**