[BUGFIX] Some small DimensionMapping followup fixes

Classes/Domain/Model/Server.php

@@ -92,6 +92,7 @@ public function __construct()
     protected function initStorageObjects()
     {
         $this->modules = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
+        $this->dimensionMappings = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
     }
 
     /**

Classes/Mapping/AbstractMapping.php

@@ -219,7 +219,7 @@ protected function determineDataTypeForProperty($propertyName, $object)
             $property = new PropertyReflection($object, $propertyName);
             $varTags = $property->getTagValues('var');
             if (!empty($varTags)) {
-                return $varTags[0];
+                return strpos($varTags[0], ' ') !== false ? substr($varTags[0], 0, strpos($varTags[0], ' ')) : $varTags[0];
             }
         }
 
@@ -448,17 +448,17 @@ protected function importObjectWithDimensionMappings(array $data, $object, Event
             }
         }
 
-        if ($defaultDimensionMapping === null) {
-            throw new \Exception('No DimensionMapping found for Default Language!');
-        }
-
         if (!$object) {
             $object = $this->createObject($event);
         }
 
         $this->mapPropertiesFromDataToObject($data, $object, $event->getModule(), $defaultDimensionMapping);
         $this->getObjectRepository()->update($object);
 
+        if ($defaultDimensionMapping === null) {
+            return;
+        }
+
         $dataMapper = GeneralUtility::makeInstance(DataMapper::class);
         foreach ($translationDimensionMappings as $translationDimensionMapping) {
             $existingRow = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('*', $this->getTableName(), 'sys_language_uid = ' . $translationDimensionMapping->getLanguage() . ' AND l10n_parent = ' . $object->getUid());

Classes/Mapping/FalMapping.php

@@ -1,6 +1,7 @@
 <?php
 namespace Crossmedia\Fourallportal\Mapping;
 
+use Crossmedia\Fourallportal\Domain\Model\DimensionMapping;
 use Crossmedia\Fourallportal\Domain\Model\Event;
 use Crossmedia\Fourallportal\Domain\Model\Module;
 use Crossmedia\Fourallportal\Domain\Model\Server;
@@ -85,11 +86,12 @@ public function import(array $data, Event $event)
      * @param array $data
      * @param \TYPO3\CMS\Extbase\DomainObject\AbstractEntity $object
      * @param Module $module
+     * @param DimensionMapping|null $dimensionMapping
      * @return AbstractEntity
      */
-    protected function mapPropertiesFromDataToObject(array $data, $object, Module $module)
+    protected function mapPropertiesFromDataToObject(array $data, $object, Module $module, DimensionMapping $dimensionMapping = null)
     {
-        parent::mapPropertiesFromDataToObject($data, $object, $module);
+        parent::mapPropertiesFromDataToObject($data, $object, $module, $dimensionMapping);
         $metadata = [];
         $map = MappingRegister::resolvePropertyMapForMapper(static::class);