some small cleanup

dcarbone · Jan 26, 2025 · 9e57928 · 9e57928
1 parent cecf0cb
commit 9e57928
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/Utilities/TypeHintUtils.php b/src/Utilities/TypeHintUtils.php
@@ -261,17 +261,15 @@ public static function buildSetterParameterDocHint(Version  $version,
         $hintTypes = self::buildBaseHintParts($version, $pt, true);
 
 
-        if ($property->isValueProperty() || $pt->isPrimitiveOrListType()) {
-            $hintTypes[] = $pt->getFullyQualifiedClassName(true);
-        }
-
         if ($pt->isPrimitiveContainer()) {
             $vp = $pt->getProperties()->getProperty(PHPFHIR_VALUE_PROPERTY_NAME);
             array_push(
                 $hintTypes,
                 $vp->getValueFHIRType()->getFullyQualifiedClassName(true),
                 $pt->getFullyQualifiedClassName(true),
             );
+        } else if ($property->isValueProperty() || $pt->isPrimitiveOrListType()) {
+            $hintTypes[] = $pt->getFullyQualifiedClassName(true);
         }
 
         if (!$ignoreCollection && $property->isCollection()) {
@@ -309,17 +307,15 @@ public static function buildSetterParameterHint(Version  $version,
         } else {
             $hintTypes = self::buildBaseHintParts($version, $pt, false);
 
-            if ($property->isValueProperty() || $pt->isPrimitiveOrListType()) {
-                $hintTypes[] = $pt->getClassName();
-            }
-
             if ($pt->isPrimitiveContainer()) {
                 $vp = $pt->getProperties()->getProperty(PHPFHIR_VALUE_PROPERTY_NAME);
                 array_push(
                     $hintTypes,
                     $vp->getValueFHIRType()->getClassName(),
                     $pt->getClassName(),
                 );
+            } else if ($property->isValueProperty() || $pt->isPrimitiveOrListType()) {
+                $hintTypes[] = $pt->getClassName();
             }
         }