Merge branch 'develop' into 2.1

Author: lukdens

lib/CultureFeed/Cdb/Data/Calendar/OpeningTime.php

@@ -102,13 +102,11 @@ public static function parseFromCdbXml(SimpleXMLElement $xmlElement)
 
         $attributes = $xmlElement->attributes();
         if (!isset($attributes['from'])) {
-            throw new CultureFeed_Cdb_ParseException(
-                "Required attribute 'from' is missing on openingtime"
-            );
+            $openFrom = '00:00:00';
+        } else {
+            $openFrom = (string) $attributes['from'];
         }
 
-        $openFrom = (string) $attributes['from'];
-
         $openTill = null;
         if (isset($attributes['to'])) {
             $openTill = (string) $attributes['to'];

lib/CultureFeed/Cdb/Data/Category.php

@@ -22,6 +22,7 @@ class CultureFeed_Cdb_Data_Category implements CultureFeed_Cdb_IElement
      */
     const CATEGORY_TYPE_TARGET_AUDIANCE = 'targetaudience';
     const CATEGORY_TYPE_FLANDERS_REGION = 'flandersregion';
+    const CATEGORY_TYPE_UMV = 'umv';
 
     /**
      * Type of category.

lib/CultureFeed/Cdb/Item/Actor.php

@@ -172,11 +172,22 @@ public function appendToDOM(DOMElement $element, $cdbScheme = '3.2')
         }
 
         if (count($this->keywords) > 0) {
-            $keywordElement = $dom->createElement('keywords');
-            $keywordElement->appendChild(
-                $dom->createTextNode(implode(';', $this->keywords))
-            );
-            $actorElement->appendChild($keywordElement);
+            $keywordsElement = $dom->createElement('keywords');
+            if (version_compare($cdbScheme, '3.3', '>=')) {
+                foreach ($this->keywords as $keyword) {
+                    $keyword->appendToDOM($keywordsElement);
+                }
+                $actorElement->appendChild($keywordsElement);
+            } else {
+                $keywords = array();
+                foreach ($this->keywords as $keyword) {
+                    $keywords[$keyword->getValue()] = $keyword->getValue();
+                }
+                $keywordsElement->appendChild(
+                    $dom->createTextNode(implode(';', $keywords))
+                );
+                $actorElement->appendChild($keywordsElement);
+            }
         }
 
         if ($this->weekScheme) {