Merge 388bd56 into 9856091

cultuurnet · Jan 13, 2017 · 4ddc3a5 · 4ddc3a5
2 parents 9856091 + 388bd56
commit 4ddc3a5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/CultureFeed/Cdb/Item/Base.php b/lib/CultureFeed/Cdb/Item/Base.php
@@ -675,11 +675,12 @@ public function deleteKeyword($keyword)
             $keyword = $keyword->getValue();
         }
 
-        if (!isset($this->keywords[$keyword])) {
-            throw new Exception('Trying to remove a non-existing keyword.');
-        }
-
-        unset($this->keywords[$keyword]);
+        $this->keywords = array_filter(
+            $this->keywords,
+            function (CultureFeed_Cdb_Data_Keyword $itemKeyword) use ($keyword) {
+                return strcmp(mb_strtolower($itemKeyword->getValue(), 'UTF-8'), mb_strtolower($keyword, 'UTF-8')) !== 0;
+            }
+        );
     }
 
     /**

diff --git a/tests/CultureFeed/Cdb/Item/EventTest.php b/tests/CultureFeed/Cdb/Item/EventTest.php
@@ -1122,6 +1122,7 @@ public function testDeleteKeywordObjects()
     {
         $this->event->addKeyword(new CultureFeed_Cdb_Data_Keyword('foo'));
         $this->event->addKeyword(new CultureFeed_Cdb_Data_Keyword('bar'));
+        $this->event->addKeyword(new CultureFeed_Cdb_Data_Keyword('BAR'));
 
         $this->event->deleteKeyword(new CultureFeed_Cdb_Data_Keyword('bar'));