Added state cloning if it is object

x25 · x25 · commit 90696ad348a6 · 2014-04-19T17:20:54.000+04:00
diff --git a/Memento/Memento.php b/Memento/Memento.php
@@ -4,19 +4,19 @@
 
 class Memento
 {
-    /* @var string */
+    /* @var mixed */
     private $state;
 
     /**
-     * @param string $stateToSave
+     * @param mixed $stateToSave
      */
     public function __construct($stateToSave)
     {
         $this->state = $stateToSave;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
     public function getState()
     {
diff --git a/Memento/Originator.php b/Memento/Originator.php
@@ -4,14 +4,14 @@
 
 class Originator
 {
-    /* @var string */
+    /* @var mixed */
     private $state;
 
     // The class could also contain additional data that is not part of the
     // state saved in the memento..
 
     /**
-     * @param string $state
+     * @param mixed $state
      */
     public function setState($state)
     {
@@ -23,7 +23,9 @@ public function setState($state)
      */
     public function saveToMemento()
     {
-        return new Memento($this->state);
+        $state = is_object($this->state) ? clone $this->state : $this->state;
+
+        return new Memento($state);
     }
 
     public function restoreFromMemento(Memento $memento)
diff --git a/Tests/Memento/MementoTest.php b/Tests/Memento/MementoTest.php
@@ -5,12 +5,12 @@
 use DesignPatterns\Memento;
 
 /**
- * MementoTest tests memento design pattern
+ * MementoTest tests the memento pattern
  */
 class MementoTest extends \PHPUnit_Framework_TestCase
 {
 
-    public function testOriginator()
+    public function testStringState()
     {
         $originator = new Memento\Originator();
         $originator->setState("State1");
@@ -33,4 +33,37 @@ public function testOriginator()
 
         $this->assertAttributeEquals("State2", "state", $originator);
     }
+
+    public function testObjectState()
+    {
+        $originator = new Memento\Originator();
+
+        $foo = new \stdClass();
+        $foo->data = "foo";
+
+        $originator->setState($foo);
+
+        $this->assertAttributeEquals($foo, "state", $originator);
+
+        $savedState = $originator->saveToMemento();
+
+        $this->assertAttributeEquals($foo, "state", $savedState);
+
+        $bar = new \stdClass();
+        $bar->data = "bar";
+
+        $originator->setState($bar);
+
+        $this->assertAttributeEquals($bar, "state", $originator);
+
+        $originator->restoreFromMemento($savedState);
+
+        $this->assertAttributeEquals($foo, "state", $originator);
+
+        $foo->data = null;
+
+        $this->assertAttributeNotEquals($foo, "state", $savedState);
+
+        $this->assertAttributeNotEquals($foo, "state", $originator);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,19 +4,19 @@`
`4`	`4`
`5`	`5`	`class Memento`
`6`	`6`	`{`
`7`		`- /* @var string */`
	`7`	`+ /* @var mixed */`
`8`	`8`	`private $state;`
`9`	`9`
`10`	`10`	`/**`
`11`		`- * @param string $stateToSave`
	`11`	`+ * @param mixed $stateToSave`
`12`	`12`	`*/`
`13`	`13`	`public function __construct($stateToSave)`
`14`	`14`	`{`
`15`	`15`	`$this->state = $stateToSave;`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/**`
`19`		`- * @return string`
	`19`	`+ * @return mixed`
`20`	`20`	`*/`
`21`	`21`	`public function getState()`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@`
`4`	`4`
`5`	`5`	`class Originator`
`6`	`6`	`{`
`7`		`- /* @var string */`
	`7`	`+ /* @var mixed */`
`8`	`8`	`private $state;`
`9`	`9`
`10`	`10`	`// The class could also contain additional data that is not part of the`
`11`	`11`	`// state saved in the memento..`
`12`	`12`
`13`	`13`	`/**`
`14`		`- * @param string $state`
	`14`	`+ * @param mixed $state`
`15`	`15`	`*/`
`16`	`16`	`public function setState($state)`
`17`	`17`	`{`
`@@ -23,7 +23,9 @@ public function setState($state)`
`23`	`23`	`*/`
`24`	`24`	`public function saveToMemento()`
`25`	`25`	`{`
`26`		`- return new Memento($this->state);`
	`26`	`+ $state = is_object($this->state) ? clone $this->state : $this->state;`
	`27`	`+`
	`28`	`+ return new Memento($state);`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`public function restoreFromMemento(Memento $memento)`