Merge pull request #4 from WyriHaximus/from-array-clone-false

fromArray can also update the current instance

Author: WyriHaximus

src/Session.php

@@ -135,21 +135,25 @@ public function toArray(): array
 
     /**
      * @param  array                     $session
+     * @param  bool                      $clone
      * @throws \InvalidArgumentException
      * @return Session
      */
-    public function fromArray(array $session): self
+    public function fromArray(array $session, bool $clone = true): self
     {
         if (!isset($session['id']) || !isset($session['contents']) || !isset($session['oldIds']) || !isset($session['oldIds'])) {
             throw new \InvalidArgumentException('Session array most contain "id", "contents", "oldIds", and "status".');
         }
 
-        $clone = clone $this;
-        $clone->id = $session['id'];
-        $clone->contents = $session['contents'];
-        $clone->oldIds = $session['oldIds'];
-        $clone->status = $session['status'];
+        $self = $this;
+        if ($clone === true) {
+            $self = clone $this;
+        }
+        $self->id = $session['id'];
+        $self->contents = $session['contents'];
+        $self->oldIds = $session['oldIds'];
+        $self->status = $session['status'];
 
-        return $clone;
+        return $self;
     }
 }

tests/SessionTest.php

@@ -106,4 +106,36 @@ public function testToFromArray()
         self::assertNotSame($session, $newSession);
         self::assertSame($array, $newSession->toArray());
     }
+
+    public function testToFromArrayNoClone()
+    {
+        $session = new Session('', [], new RandomBytes());
+
+        self::assertSame(
+            [
+                'id' => '',
+                'contents' => [],
+                'oldIds' => [],
+                'status' => 1,
+            ],
+            $session->toArray()
+        );
+
+        $session->begin();
+
+        self::assertSame(
+            [
+                'id' => $session->getId(),
+                'contents' => [],
+                'oldIds' => [],
+                'status' => 2,
+            ],
+            $session->toArray()
+        );
+
+        $array = $session->toArray();
+        $newSession = $session->fromArray($array, false);
+        self::assertSame($session, $newSession);
+        self::assertSame($array, $newSession->toArray());
+    }
 }