correcting nonsense with value container

Author: dcarbone

template/types/methods/constructors/default.php

@@ -25,37 +25,35 @@
 /** @var \DCarbone\PHPFHIR\Definition\Type|null $parentType */
 
 $typeClassName = $type->getClassName();
-$constructorParamName = 'data';
 $valueProperty = null;
 if ($type->isValueContainer()) {
-    $constructorParamName = 'value';
     $valueProperty = $type->getLocalProperties()->getProperty(PHPFHIR_VALUE_PROPERTY_NAME);
 }
 
 ob_start(); ?>
     /**
      * <?php echo $typeClassName; ?> Constructor
-     * @param null|array<?php if ($type->isValueContainer()) : ?>|<?php echo TypeHintUtils::propertySetterTypeHint($config, $valueProperty, false); endif; ?> $<?php echo $constructorParamName; ?>
+     * @param null|array<?php if ($type->isValueContainer()) : ?>|<?php echo TypeHintUtils::propertySetterTypeHint($config, $valueProperty, false); endif; ?> $data
 
      */
-    public function __construct(null|array<?php if ($type->isValueContainer()) : ?>|<?php echo TypeHintUtils::propertySetterTypeHint($config, $valueProperty, false); endif; ?> $<?php echo $constructorParamName; ?> = null)
+    public function __construct(null|array<?php if ($type->isValueContainer()) : ?>|<?php echo TypeHintUtils::propertySetterTypeHint($config, $valueProperty, false); endif; ?> $data = null)
     {
-        if (null === $<?php echo $constructorParamName; ?> || [] === $<?php echo $constructorParamName; ?>) {
+        if (null === $data|| [] === $data) {
             return;
         }
 <?php if ($type->isValueContainer()) : ?>
-        if (!is_array($<?php echo $constructorParamName; ?>)) {
-            $this->setValue($<?php echo $constructorParamName; ?>);
+        if (!is_array($data)) {
+            $this->setValue($data);
             return;
         }
 <?php endif; if ($type->hasParentWithLocalProperties()) : // add parent constructor call ?>
-        parent::__construct($<?php echo $constructorParamName; ?>);<?php endif; ?><?php if ($type->isCommentContainer() && !$type->hasCommentContainerParent()) : // only parse comments if parent isn't already doing it. ?>
+        parent::__construct($data);<?php endif; ?><?php if ($type->isCommentContainer() && !$type->hasCommentContainerParent()) : // only parse comments if parent isn't already doing it. ?>
 
-        if (isset($<?php echo $constructorParamName; ?>[PHPFHIRConstants::JSON_FIELD_FHIR_COMMENTS])) {
-            if (is_array($<?php echo $constructorParamName; ?>[PHPFHIRConstants::JSON_FIELD_FHIR_COMMENTS])) {
-                $this->_setFHIRComments($<?php echo $constructorParamName; ?>[PHPFHIRConstants::JSON_FIELD_FHIR_COMMENTS]);
-            } elseif (is_string($<?php echo $constructorParamName; ?>[PHPFHIRConstants::JSON_FIELD_FHIR_COMMENTS])) {
-                $this->_addFHIRComment($<?php echo $constructorParamName; ?>[PHPFHIRConstants::JSON_FIELD_FHIR_COMMENTS]);
+        if (isset($data[PHPFHIRConstants::JSON_FIELD_FHIR_COMMENTS])) {
+            if (is_array($data[PHPFHIRConstants::JSON_FIELD_FHIR_COMMENTS])) {
+                $this->_setFHIRComments($data[PHPFHIRConstants::JSON_FIELD_FHIR_COMMENTS]);
+            } elseif (is_string($data[PHPFHIRConstants::JSON_FIELD_FHIR_COMMENTS])) {
+                $this->_addFHIRComment($data[PHPFHIRConstants::JSON_FIELD_FHIR_COMMENTS]);
             }
         }<?php endif; ?>
 

template/types/methods/constructors/primitive_container.php

@@ -44,13 +44,9 @@ public function __construct(<?php echo TypeHintUtils::propertySetterTypeHint($co
         if (null === $data) {
             return;
         }
-        if ($data instanceof <?php echo $typeImports->getImportByType($valuePropertyType); ?>) {
+        if (is_scalar($data) || $data instanceof <?php echo $typeImports->getImportByType($valuePropertyType); ?>) {
             $this->setValue($data);
             return;
-        }
-        if (is_scalar($data)) {
-            $this->setValue(new <?php echo $typeImports->getImportByType($valuePropertyType); ?>($data));
-            return;
         }<?php if ($parentType) : ?>
 
         parent::__construct($data);