From f4b84414eaf7f94140eb0cf6cd6b652ccbba77c6 Mon Sep 17 00:00:00 2001 From: Daniel Carbone Date: Sat, 1 Feb 2025 16:02:46 -0600 Subject: [PATCH] indentation cleanup --- template/versions/types/class_default.php | 60 +++++++++++++---------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/template/versions/types/class_default.php b/template/versions/types/class_default.php index 7fec8483..31a74569 100644 --- a/template/versions/types/class_default.php +++ b/template/versions/types/class_default.php @@ -187,15 +187,16 @@ public function _getResourceType(): string /* */ $version, - 'type' => $type, - ] -); -if ($type->isPrimitiveContainer() || $type->hasPrimitiveContainerParent()) : ?> + echo require_with( + PHPFHIR_TEMPLATE_VERSION_TYPES_VALIDATION_DIR . '/methods.php', + [ + 'version' => $version, + 'type' => $type, + ] + ); + + if ($type->isPrimitiveContainer() || $type->hasPrimitiveContainerParent()) : ?> /* */ public function _nonValueFieldDefined(): bool @@ -206,30 +207,31 @@ public function _nonValueFieldDefined(): bool || isset($this->getName(); ?>); } - + /* */ isPrimitiveOrListType()) : + if (!$type->isPrimitiveOrListType()) : + echo require_with( + PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR . '/xml.php', + [ + 'version' => $version, + 'type' => $type, + ] + ); + endif; + + echo "\n"; + echo require_with( - PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR . '/xml.php', + PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR . '/json.php', [ 'version' => $version, - 'type' => $type, + 'type' => $type, ] ); -endif; - -echo "\n"; - -echo require_with( - PHPFHIR_TEMPLATE_VERSION_TYPES_SERIALIZATION_DIR . '/json.php', - [ - 'version' => $version, - 'type' => $type, - ] -); endif; @@ -241,10 +243,14 @@ public function _nonValueFieldDefined(): bool */ public function __toString(): string { -isPrimitiveOrListType() || $type->hasPrimitiveOrListParent() || $type->isPrimitiveContainer() || $type->hasPrimitiveContainerParent()) : ?> +isPrimitiveOrListType() || $type->hasPrimitiveOrListParent() || $type->isPrimitiveContainer() || $type->hasPrimitiveContainerParent()) : ?> return $this->_getFormattedValue(); - + return self::FHIR_TYPE_NAME; - + } -}}