extend spy format

Author: nekufa

src/Plugins/Spy.php

@@ -62,11 +62,20 @@ private function getKey(Entity $instance, Space $space)
 
     public function getChanges()
     {
-        return (object) [
-            'create' => array_values($this->create),
-            'update' => array_values($this->update),
-            'remove' => array_values($this->remove),
-        ];
+        $result = (object) [];
+
+        foreach(['create', 'update', 'remove'] as $action) {
+            $data = [];
+            foreach($this->$action as $key => $row) {
+                list($space) = explode(':', $key);
+                if(!array_key_exists($space, $data)) {
+                    $data[$space][] = $row;
+                }
+            }
+            $result->$action = $data;
+        }
+
+        return $result;
     }
 
     public function hasChanges()

tests/SpyTest.php

@@ -47,7 +47,7 @@ public function test()
         $this->assertCount(0, $changes->create);
         $this->assertCount(0, $changes->update);
         $this->assertCount(1, $changes->remove);
-        $this->assertSame(array_values($changes->remove)[0]->id, $nekufa->id);
+        $this->assertSame($changes->remove['person'][0]->id, $nekufa->id);
         $this->assertTrue($spy->hasChanges());
 
         $spy->reset();
@@ -66,7 +66,7 @@ public function test()
         $this->assertCount(0, $changes->update);
         $this->assertCount(0, $changes->remove);
 
-        $this->assertSame([$vasya], array_values($changes->create));
+        $this->assertSame([$vasya], $changes->create['person']);
 
         $vasya->email = 'vasya@ya.ru';
         $mapper->save($vasya);
@@ -76,7 +76,7 @@ public function test()
         $this->assertCount(1, $changes->create);
         $this->assertCount(0, $changes->update);
         $this->assertCount(0, $changes->remove);
-        $this->assertSame([$vasya], array_values($changes->create));
+        $this->assertSame([$vasya], array_values($changes->create['person']));
 
         $mapper->remove($vasya);
         $changes = $spy->getChanges();