couple of fixes for primitives

dcarbone · Jan 17, 2025 · 09a7acd · 09a7acd
1 parent 9fc0e72
commit 09a7acd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/template/versions/types/class_default.php b/template/versions/types/class_default.php
@@ -98,13 +98,15 @@
 
 // -- end field properties
 
-echo require_with(
-    PHPFHIR_TEMPLATE_VERSION_TYPES_METHODS_DIR . '/constructor.php',
-    [
-        'version' => $version,
-        'type' => $type,
-    ]
-); ?>
+if (!$type->hasPrimitiveOrListParent()) :
+    echo require_with(
+        PHPFHIR_TEMPLATE_VERSION_TYPES_METHODS_DIR . '/constructor.php',
+        [
+            'version' => $version,
+            'type' => $type,
+        ]
+    );
+endif; ?>
 
     /**
      * @return string
@@ -127,7 +129,7 @@ public function _getResourceType(): string
 <?php
 endif;
 
-if ($type->hasLocalProperties()) :
+if (!$type->hasPrimitiveOrListParent() && $type->hasLocalProperties()) :
     echo "\n";
 
     // --- property methods

diff --git a/template/versions/types/properties/methods/primitive.php b/template/versions/types/properties/methods/primitive.php
@@ -33,7 +33,7 @@
     public function getValue(): <?php echo TypeHintUtils::primitivePHPValueTypeHint($version, $primitiveType, true); ?>
 
     {
-        return $this->value;
+        return $this->value ?? null;
     }
 
 <?php
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ @@
         public function getValue(): <?php echo TypeHintUtils::primitivePHPValueTypeHint($version, $primitiveType, true); ?>
         {
-            return $this->value;
+            return $this->value ?? null;
         }
     <?php
@@ Expand Down @@