some fixes for the base type, imports are still a bit of a mess

dcarbone · Feb 1, 2025 · 8544224 · 8544224
1 parent 4b86dd2
commit 8544224
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/Version/Definition/Type.php b/src/Version/Definition/Type.php
@@ -852,7 +852,7 @@ public function getDirectlyImplementedInterfaces(): array
 
         // dstu1 has its own special type interface
         if ($sourceMeta->isDSTU1() && !$this->isPrimitiveOrListType() && !$this->hasPrimitiveOrListParent()) {
-            if (null === $this->getParentType()) {
+            if (!$this->hasConcreteParent()) {
                 $interfaces[PHPFHIR_TYPES_INTERFACE_DSTU1_TYPE] = $coreFiles
                     ->getCoreFileByEntityName(PHPFHIR_TYPES_INTERFACE_DSTU1_TYPE)
                     ->getFullyQualifiedNamespace(false);
@@ -884,7 +884,7 @@ public function getDirectlyImplementedInterfaces(): array
                     ->getCoreFileByEntityName(PHPFHIR_TYPES_INTERFACE_RESOURCE_TYPE)
                     ->getFullyQualifiedNamespace(false);
             }
-        } else if (!$this->hasParent() && !$sourceMeta->isDSTU1()) {
+        } else if (!$this->hasParent() && !$sourceMeta->isDSTU1() && !$this->isAbstract()) {
             $interfaces[PHPFHIR_TYPES_INTERFACE_ELEMENT_TYPE] = $coreFiles
                 ->getCoreFileByEntityName(PHPFHIR_TYPES_INTERFACE_ELEMENT_TYPE)
                 ->getFullyQualifiedNamespace(false);
@@ -917,10 +917,10 @@ public function getDirectlyUsedTraits(): array
         $parentType = $this->getParentType();
         $coreFiles = $this->_version->getConfig()->getCoreFiles();
 
-        if (null === $parentType) {
+        if (!$this->hasConcreteParent()) {
             // if this type has no parent(s), try to add all traits
 
-            if ($this->isCommentContainer()) {
+            if ($this->isCommentContainer() && !$this->hasCommentContainerParent()) {
                 $traits[PHPFHIR_TYPES_TRAIT_COMMENT_CONTAINER] = $coreFiles
                     ->getCoreFileByEntityName(PHPFHIR_TYPES_TRAIT_COMMENT_CONTAINER)
                     ->getFullyQualifiedNamespace(false);

diff --git a/template/versions/types/class_default.php b/template/versions/types/class_default.php
@@ -187,14 +187,13 @@ public function _getResourceType(): string
 
     /* <?php echo basename(__FILE__) . ':' . __LINE__; ?> */
 <?php
-    echo require_with(
-        PHPFHIR_TEMPLATE_VERSION_TYPES_VALIDATION_DIR . '/methods.php',
-        [
-            'version' => $version,
-            'type' => $type,
-        ]
-    );
-endif;
+echo require_with(
+    PHPFHIR_TEMPLATE_VERSION_TYPES_VALIDATION_DIR . '/methods.php',
+    [
+        'version' => $version,
+        'type' => $type,
+    ]
+);
 
 if ($type->isPrimitiveContainer() || $type->hasPrimitiveContainerParent()) : ?>
 
@@ -232,6 +231,8 @@ public function _nonValueFieldDefined(): bool
     ]
 );
 
+endif;
+
 if (null === $type->getParentType()) : ?>
 
     /* <?php echo basename(__FILE__) . ':' . __LINE__; ?> */