Merge remote-tracking branch 'origin/1.10' into 2.0

Author: mcop1

doc/03_Configuration/06_Mapping_Configuration/02_Transformation_Pipeline.md

@@ -35,7 +35,15 @@ Their name is usually prefixed with `As`.
   input quanitity value, expects first item in array to be value, second item in array to be unit id. 
 - **As Input Quantity Value Array**: Same like `As Input Quantity Value`, but for arrays of values. Expects an array
   with sub-arrays where first item to be value and second item to be unit id each and results in an array of quantity value objects.
-- **As Numeric**: Converts data to a numeric by using `floatval`.
+- **As Numeric**: Converts data to a numeric with type casting.
+  - `Return null if empty` option:
+
+    | Input   | Output     |
+    | ------- | ---------- |
+    | 1234    | 1234       |
+    | String  | --EMPTY--  |
+    |         | --EMPTY--  |
+    | 0       | 0          |
 - **As Quantity Value**: Converts an array to a quantity value object for 
     quanitity value, expects first item in array to be value, second item in array to be unit id.
 - **As Quantity Value Array**: Same like `As Quantity Value`, but for arrays of values. Expects an array

src/Mapping/DataTarget/Direct.php

@@ -149,7 +149,7 @@ protected function checkAssignData($newData, $valueContainer, $getter)
             $fieldName = $fieldNameParts[2];
         }
 
-        if ($this->fieldName === 'key') {
+        if ($this->fieldName === 'key' || $this->fieldName === 'type') {
             $currentDataIsEmpty = empty($currentData);
             $newDataIsEmpty = empty($newData);
         } else {

src/Mapping/Operator/Factory/Numeric.php

@@ -32,9 +32,9 @@ public function process($inputData, bool $dryRun = false)
             $inputData = reset($inputData);
         }
 
-        $floatValue = floatval($inputData);
+        $floatValue = (float) $inputData;
 
-        if ($this->returnNullIfEmpty && empty($floatValue)) {
+        if ($this->returnNullIfEmpty && !is_numeric($inputData) && $floatValue === 0.0) {
             return null;
         }
 
@@ -65,7 +65,7 @@ public function evaluateReturnType(string $inputType, ?int $index = null): strin
      */
     public function generateResultPreview($inputData)
     {
-        if ($this->returnNullIfEmpty && empty($inputData)) {
+        if ($this->returnNullIfEmpty && !is_numeric($inputData)) {
             return null;
         }
 

src/Processing/ImportProcessingService.php

@@ -256,7 +256,7 @@ protected function processElement(string $configName, array $importDataRow, Reso
                     'fileObject' => new FileObject(json_encode($importDataRow))
                 ]);
             }
-        } catch (\Exception | \TypeError $e) {
+        } catch (\Throwable $e) {
             $message = "Error processing element: {$importDataRowString}";
             $this->logger->error($message . $e);