real close now

dcarbone · Jan 31, 2025 · f726a75 · f726a75
1 parent fae0a6b
commit f726a75
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/Utils/XMLValueLocationUtils.php b/src/Utils/XMLValueLocationUtils.php
@@ -26,20 +26,19 @@ class XMLValueLocationUtils
     public static function determineDefaultLocation(Type $type, Property $property, bool $withClass): string
     {
         $propType = $property->getValueFHIRType();
-        if ($property->isValueProperty()) {
+        if ($propType->isPrimitiveOrListType() || $propType->hasPrimitiveOrListParent()) {
             $case = match (true) {
-                $type->isQuantity() || $type->hasQuantityParent() => 'CONTAINER_VALUE',
-                $type->isValueContainer() || $type->hasValueContainerParent() => 'CONTAINER_ATTRIBUTE',
-                default => 'ELEMENT_ATTRIBUTE'
+                $type->isPrimitiveContainer() || $type->hasPrimitiveContainerParent() => 'CONTAINER_ATTRIBUTE',
+                default => 'PARENT_ATTRIBUTE',
             };
-        } else if ($propType->isPrimitiveOrListType() || $propType->hasPrimitiveOrListParent()) {
+        } else if ($property->isValueProperty()) {
             $case = match (true) {
-                $type->isPrimitiveContainer() || $type->hasPrimitiveContainerParent() => 'CONTAINER_ATTRIBUTE',
-                default => 'ELEMENT_ATTRIBUTE',
+                $type->isQuantity() || $type->hasQuantityParent() => 'CONTAINER_ATTRIBUTE',
+                $type->isValueContainer() || $type->hasValueContainerParent() => 'CONTAINER_ATTRIBUTE',
+                default => 'ELEMENT_ATTRIBUTE'
             };
         } else {
             $case = match (true) {
-                $type->isQuantity() || $type->hasQuantityParent() => 'CONTAINER_VALUE',
                 $propType->isValueContainer() || $propType->hasValueContainerParent() => 'CONTAINER_ATTRIBUTE',
                 default => 'ELEMENT_ATTRIBUTE',
             };