Cloning ViewModel now also clones it's variables if they are an object

src/Model/ViewModel.php

@@ -140,6 +140,19 @@ public function __unset($name)
         unset($this->variables[$name]);
     }
 
+    /**
+     * Called after this view model is cloned.
+     * Clones variables property so variables changes done in the new instance don't change the old one.
+     *
+     * @return void
+     */
+    public function __clone()
+    {
+        if (is_object($this->variables)) {
+            $this->variables = clone $this->variables;
+        }
+    }
+
     /**
      * Set a single option
      *

test/Model/ViewModelTest.php

@@ -340,4 +340,25 @@ public function testGetChildrenByCaptureToNonRecursive()
 
         $this->assertEmpty($model->getChildrenByCaptureTo('bar', false));
     }
+
+    public function testCloneCopiesVariables()
+    {
+        $model1 = new ViewModel();
+        $model1->setVariables(['a' => 'foo']);
+        $model2 = clone $model1;
+        $model2->setVariables(['a' => 'bar']);
+
+        $this->assertEquals('foo', $model1->getVariable('a'));
+        $this->assertEquals('bar', $model2->getVariable('a'));
+    }
+
+    public function testCloneWithArray()
+    {
+        $model1 = new ViewModel(['a' => 'foo']);
+        $model2 = clone $model1;
+        $model2->setVariables(['a' => 'bar']);
+
+        $this->assertEquals('foo', $model1->getVariable('a'));
+        $this->assertEquals('bar', $model2->getVariable('a'));
+    }
 }