Add detections on removal / additions in Set::compute

Wisembly · Nov 15, 2013 · 0048e4c · 0048e4c
1 parent 441e2d6
commit 0048e4c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/src/Totem/Set.php b/src/Totem/Set.php
@@ -23,8 +23,8 @@
 use Totem\AbstractSnapshot,
     Totem\Exception\IncomparableDataException,
 
+    Totem\Change\Removal,
     Totem\Change\Addition,
-    Totem\Change\Deletion,
     Totem\Change\Modification,
 
     Totem\Snapshot\ArraySnapshot,
@@ -131,13 +131,14 @@ public function count()
      */
     private function compute(AbstractSnapshot $old, AbstractSnapshot $new)
     {
-        if ($old->getDataKeys() !== $new->getDataKeys()) {
-            throw new \InvalidArgumentException('You can\'t compare two snapshots having a different structure');
-        }
-
         $this->changes = [];
 
-        foreach ($new->getDataKeys() as $key) {
+        foreach ($old->getDataKeys() as $key) {
+            if (!isset($new[$key])) {
+                $this->changes[$key] = new Removal($old[$key] instanceof AbstractSnapshot ? $old[$key]->getRawData() : $old[$key]);
+                continue;
+            }
+
             $current = ['old' => $old[$key] instanceof AbstractSnapshot ? $old[$key]->getRawData() : $old[$key],
                         'new' => $new[$key] instanceof AbstractSnapshot ? $new[$key]->getRawData() : $new[$key]];
 
@@ -165,6 +166,11 @@ private function compute(AbstractSnapshot $old, AbstractSnapshot $new)
                     }
             }
         }
+
+        // added elements
+        foreach (array_diff($new->getDataKeys(), $old->getDataKeys()) as $key) {
+            $this->changes[$key] = new Addition($new[$key] instanceof AbstractSnapshot ? $new[$key]->getRawData() : $new[$key]);
+        }
     }
 }
 
diff --git a/test/Totem/SetTest.php b/test/Totem/SetTest.php
@@ -22,20 +22,19 @@
 class SetTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @expectedException InvalidArgumentException
      * @dataProvider invalidEntryProvider
      */
-    public function testSetChangesWithInvalidEntity($old, $new)
+    public function testSetChangesWithChangedStructure($old, $new, $class)
     {
-        new Set(new Snapshot(['data' => $old]), new Snapshot(['data' => $new]));
+        $set = new Set(new Snapshot(['data' => $old]), new Snapshot(['data' => $new]));
+
+        $this->assertInstanceOf('Totem\\Change\\' . $class, $set->getChange('1'));
     }
 
     public function invalidEntryProvider()
     {
-        return [[['foo'], ['bar' => 'baz']],
-                [['foo'], ['bar', 'baz']],
-                [['foo', 'bar'], ['baz']],
-                [['foo' => 'bar'], ['baz']]];
+        return [[['foo'], ['foo', 'bar'], 'Addition'],
+                [['foo', 'bar'], ['foo'], 'Removal']];
     }
 
     public function testHasChanged()