Fixed mergeWith flags #36

Author: oscarotero

src/Translations.php

@@ -211,9 +211,9 @@ public function mergeWith(Translations $translations, $method = null)
             }
         }
 
-        $add = (boolean) $method & self::MERGE_ADD;
-        $references = (boolean) $method & self::MERGE_REFERENCES;
-        $comments = (boolean) $method & self::MERGE_COMMENTS;
+        $add = (boolean) ($method & self::MERGE_ADD);
+        $references = (boolean) $method & (self::MERGE_REFERENCES);
+        $comments = (boolean) ($method & self::MERGE_COMMENTS);
 
         foreach ($translations as $entry) {
             if (($existing = $this->find($entry))) {
@@ -224,13 +224,15 @@ public function mergeWith(Translations $translations, $method = null)
         }
 
         if ($method & self::MERGE_REMOVE) {
-            $iterator = $this->getIterator();
+            $filtered = array();
 
-            foreach ($iterator as $k => $entry) {
-                if (!($existing = $translations->find($entry))) {
-                    $iterator->offsetUnset($k);
+            foreach ($this as $entry) {
+                if ($translations->find($entry)) {
+                    $filtered[] = $entry;
                 }
             }
+
+            $this->exchangeArray($filtered);
         }
     }
 }

tests/TranslationsTest.php

@@ -56,4 +56,37 @@ public function testGettersSetters()
         $translations->setHeader('POT-Creation-Date', '2012-08-07 13:03+0100');
         $this->assertEquals('2012-08-07 13:03+0100', $translations->getHeader('POT-Creation-Date'));
     }
+
+    public function testMergeDefault()
+    {
+        $translations1 = Gettext\Extractors\Po::fromFile(__DIR__.'/files/po.po');
+        $translations2 = Gettext\Extractors\Po::fromFile(__DIR__.'/files/plurals.po');
+
+        $this->assertCount(9, $translations1);
+        $this->assertCount(3, $translations2);
+
+        $translations1->mergeWith($translations2);
+
+        $this->assertCount(12, $translations1);
+    }
+
+    public function testMergeAddRemove()
+    {
+        $translations1 = Gettext\Extractors\Po::fromFile(__DIR__.'/files/po.po');
+        $translations2 = Gettext\Extractors\Po::fromFile(__DIR__.'/files/plurals.po');
+
+        $translations1->mergeWith($translations2, Gettext\Translations::MERGE_REMOVE |  Gettext\Translations::MERGE_ADD);
+
+        $this->assertCount(3, $translations1);
+    }
+
+    public function testMergeRemove()
+    {
+        $translations1 = Gettext\Extractors\Po::fromFile(__DIR__.'/files/po.po');
+        $translations2 = Gettext\Extractors\Po::fromFile(__DIR__.'/files/plurals.po');
+
+        $translations1->mergeWith($translations2, Gettext\Translations::MERGE_REMOVE);
+
+        $this->assertCount(0, $translations1);
+    }
 }