formatting improvements

Author: dcarbone

template/versions/types/class_default.php

@@ -51,10 +51,10 @@
         }
 
         $propertyType = $property->getValueFHIRType(); ?>
-        public const <?php echo $property->getFieldConstantName(); ?> = '<?php echo $property->getName(); ?>';
+    public const <?php echo $property->getFieldConstantName(); ?> = '<?php echo $property->getName(); ?>';
 <?php   if (null !== $propertyType &&
     ($propertyType->getKind() === TypeKindEnum::PRIMITIVE_CONTAINER || $propertyType->isValueContainer())) :
-    ?>        public const <?php echo $property->getFieldConstantName(); ?>_EXT = '<?php echo $property->getExtName(); ?>';
+    ?>    public const <?php echo $property->getFieldConstantName(); ?>_EXT = '<?php echo $property->getExtName(); ?>';
 <?php   endif;
     endforeach;
 // -- end property field name constants
@@ -73,7 +73,6 @@
 // -- end directly implemented properties
     endforeach; ?>
 
-
     /** Default validation map for fields in type <?php echo $type->getFHIRName(); ?> */
     private const _DEFAULT_VALIDATION_RULES = [<?php if (!$type->hasLocalPropertiesWithValidations()): ?>];
 <?php else:
@@ -101,11 +100,9 @@
 // -- end field properties
 ?>
 
-
     /** @var array */
     private array $_xmlLocations = [];
 
-
 <?php echo require_with(
     PHPFHIR_TEMPLATE_VERSION_TYPES_METHODS_DIR . DIRECTORY_SEPARATOR . 'constructor.php',
     [

template/versions/types/properties/methods/default.php

@@ -64,8 +64,8 @@ public function get<?php echo ucfirst($propertyName); ?>(): <?php echo TypeHintU
 
     {
         return $this-><?php echo $propertyName; ?>;
-    }<?php if ($isCollection) : ?>
-
+    }
+<?php if ($isCollection) : ?>
 
     /**
      * @return \ArrayIterator<<?php echo $propertyType->getFullyQualifiedClassName(true); ?>>
@@ -91,7 +91,6 @@ public function get<?php echo ucfirst($propertyName); ?>Generator(): \Generator
     endif;
     if ($propertyType->hasPrimitiveParent() || $propertyTypeKind->isOneOf(TypeKindEnum::PRIMITIVE_CONTAINER, TypeKindEnum::PRIMITIVE, TypeKindEnum::LIST)) : ?>
 
-
     /**<?php if ('' !== $documentation) : ?>
 
 <?php echo $documentation; ?>
@@ -122,7 +121,6 @@ public function <?php echo $property->getSetterName(); ?>(<?php echo TypeHintUti
     }
 <?php   if ($isCollection) : ?>
 
-
     /**<?php if ('' !== $documentation) : ?>
 
 <?php echo $documentation; ?>
@@ -154,7 +152,6 @@ public function set<?php echo ucfirst($propertyName); ?>(array $<?php echo $prop
 <?php   endif;
     elseif ($propertyTypeKind->isContainer($version)) : ?>
 
-
     /**<?php if ('' !== $documentation) : ?>
 
 <?php echo $documentation; ?>
@@ -171,7 +168,6 @@ public function <?php echo $property->getSetterName() ?>(null|<?php echo PHPFHIR
     }
 <?php   if ($isCollection) : ?>
 
-
     /**<?php if ('' !== $documentation) : ?>
 
 <?php echo $documentation; ?>
@@ -215,7 +211,6 @@ public function set<?php echo ucfirst($propertyName); ?>(array $<?php echo $prop
 <?php   endif;
     else : ?>
 
-
     /**<?php if ('' !== $documentation) : ?>
 
 <?php echo $documentation; ?>
@@ -235,7 +230,6 @@ public function <?php echo $property->getSetterName(); ?>(<?php echo TypeHintUti
     }
 <?php   if ($isCollection) : ?>
 
-
     /**<?php if ('' !== $documentation) : ?>
 
 <?php echo $documentation; ?>