Allow overriding saver id only via id parameter

src/Xhgui/Saver/MongoSaver.php

@@ -18,7 +18,7 @@ public function __construct(MongoCollection $collection)
         $this->_collection = $collection;
     }
 
-    public function save(array $data): string
+    public function save(array $data, string $id = null): string
     {
         // build 'request_ts' and 'request_date' from 'request_ts_micro'
         $ts = $data['meta']['request_ts_micro'];
@@ -36,7 +36,7 @@ public function save(array $data): string
             'request_date' => date('Y-m-d', $sec),
         ];
 
-        $id = $data['_id'] ?? new MongoId();
+        $id = $id ?? new MongoId();
         $a = [
             '_id' => $id,
             'meta' => $meta,

src/Xhgui/Saver/PdoSaver.php

@@ -16,7 +16,7 @@ public function __construct(PdoRepository $db)
         $this->db = $db;
     }
 
-    public function save(array $data): string
+    public function save(array $data, string $id = null): string
     {
         $main = $data['profile']['main()'];
 
@@ -25,7 +25,7 @@ public function save(array $data): string
         $sec = $ts['sec'];
         $usec = $ts['usec'];
 
-        $id = $data['_id'] ?? Util::generateId();
+        $id = $id ?? Util::generateId();
         $this->db->saveProfile([
             'id' => $id,
             'profile' => json_encode($data['profile']),

src/Xhgui/Saver/SaverInterface.php

@@ -7,5 +7,5 @@ interface SaverInterface
     /**
      * Returns id of the saved profile
      */
-    public function save(array $data): string;
+    public function save(array $data, string $id = null): string;
 }

tests/Saver/MongoTest.php

@@ -22,7 +22,7 @@ public function testSave()
         $saver = new MongoSaver($collection);
 
         foreach ($data as $profile) {
-            $saver->save($profile);
+            $saver->save($profile, $profile['_id'] ?? null);
         }
     }
 }

tests/bootstrap.php

@@ -32,6 +32,6 @@ function loadFixture(SaverInterface $saver, $file)
         if (isset($record['_id'])) {
             $record['_id'] = new MongoId($record['_id']);
         }
-        $saver->save($record);
+        $saver->save($record, $record['_id'] ?? null);
     }
 }