fixing constructors for types that extend primitive types

dcarbone · Nov 30, 2019 · 4de1b45 · 4de1b45
1 parent e7158cb
commit 4de1b45
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/template/methods/constructor.php b/template/methods/constructor.php
@@ -16,6 +16,8 @@
  * limitations under the License.
  */
 
+use DCarbone\PHPFHIR\Enum\TypeKindEnum;
+
 /** @var \DCarbone\PHPFHIR\Definition\Property[] $sortedProperties */
 /** @var \DCarbone\PHPFHIR\Definition\Type $type */
 /** @var \DCarbone\PHPFHIR\Definition\Type|null $parentType */
@@ -30,10 +32,7 @@
 ob_start();
 
 switch (true) :
-    case $type->hasPrimitiveParent():
-        // types that are just primitive extensions do not get their own constructor.
-        break;
-    case $typeKind->isPrimitive():
+    case $typeKind->isOneOf([TypeKindEnum::PRIMITIVE, TypeKindEnum::_LIST]):
         echo require_with(PHPFHIR_TEMPLATE_CONSTRUCTORS_DIR . '/primitive.php', $requireArgs);
         break;
     case $typeKind->isPrimitiveContainer():

diff --git a/template/types/default_class.php b/template/types/default_class.php
@@ -102,16 +102,14 @@
 
 echo "\n";
 
-if (0 !== count($directProperties)) :
-    echo require_with(
-        PHPFHIR_TEMPLATE_METHODS_DIR . '/constructor.php',
-        [
-                'type' => $type,
-                'sortedProperties' => $directProperties,
-                'parentType' => $parentType,
-        ]
-    );
-endif;
+echo require_with(
+    PHPFHIR_TEMPLATE_METHODS_DIR . '/constructor.php',
+    [
+            'type' => $type,
+            'sortedProperties' => $directProperties,
+            'parentType' => $parentType,
+    ]
+);
 
 echo require_with(
     PHPFHIR_TEMPLATE_METHODS_DIR . '/common.php',