Merge e6db20d into 78dd956

klarna · Jul 2, 2019 · f795e54 · f795e54
2 parents 78dd956 + e6db20d
commit f795e54
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/src/Klarna/Rest/Resource.php b/src/Klarna/Rest/Resource.php
@@ -100,6 +100,24 @@ public function setLocation($url)
         return $this;
     }
 
+    /**
+     * Overrides: Stores the ID KEY field in order to restore it after exchanging the array without
+     * the ID field.
+     * 
+     * @param array $array Data to be exchanged
+     */
+    public function exchangeArray($array)
+    {
+        $id = $this->getId();
+
+        if (!is_null($array)) {
+            parent::exchangeArray($array);
+        }
+        if (is_null($this->getId()) && !is_null($id)) {
+            $this->setId($id);
+        }
+    }
+
     /**
      * Fetches the resource.
      *
@@ -125,6 +143,19 @@ public function fetch()
         return $this;
     }
 
+    /**
+     * Sets new ID KEY field.
+     *
+     * @param mixed $id ID field
+     *
+     * @return self
+     */
+    protected function setId($id)
+    {
+        $this[static::ID_FIELD] = $id;
+        return $this;
+    }
+
     /**
      * Sends a HTTP request to the specified url.
      *

diff --git a/tests/Component/Payments/SessionsTest.php b/tests/Component/Payments/SessionsTest.php
@@ -119,7 +119,9 @@ public function testFetch()
         $session = new Sessions($this->connector, '0b1d9815');
         $session['status'] = 'incompleted';
 
+        $this->assertEquals('0b1d9815', $session->getId());
         $session->fetch();
+        $this->assertEquals('0b1d9815', $session->getId()); // Check if the ID field still exists
 
         $this->assertEquals('completed', $session['status']);
         $this->assertEquals(123, $session['order_amount']);