From 7b35c1336c9e3859854a2a5905041f33070b3701 Mon Sep 17 00:00:00 2001 From: Daniel Carbone Date: Fri, 31 Jan 2025 18:53:33 -0600 Subject: [PATCH] interface import cleanup --- template/core/types/interface_primitive_type.php | 3 +-- template/core/types/interface_type.php | 14 -------------- .../core/types/interface_value_container_type.php | 12 +----------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/template/core/types/interface_primitive_type.php b/template/core/types/interface_primitive_type.php index 85cc9a13..7673db35 100644 --- a/template/core/types/interface_primitive_type.php +++ b/template/core/types/interface_primitive_type.php @@ -24,10 +24,9 @@ $coreFiles = $config->getCoreFiles(); $typeInterface = $coreFiles->getCoreFileByEntityName(PHPFHIR_TYPES_INTERFACE_TYPE); -$valueXMLLocationEnum = $coreFiles->getCoreFileByEntityName(PHPFHIR_ENCODING_ENUM_VALUE_XML_LOCATION); $imports = $coreFile->getImports(); -$imports->addCoreFileImports($typeInterface, $valueXMLLocationEnum); +$imports->addCoreFileImports($typeInterface); ob_start(); echo 'declare(strict_types=1); diff --git a/template/core/types/interface_type.php b/template/core/types/interface_type.php index e393745d..0d1c8782 100644 --- a/template/core/types/interface_type.php +++ b/template/core/types/interface_type.php @@ -19,18 +19,6 @@ /** @var \DCarbone\PHPFHIR\Config $config */ /** @var \DCarbone\PHPFHIR\CoreFile $coreFile */ -use DCarbone\PHPFHIR\Utilities\ImportUtils; - -$coreFiles = $config->getCoreFiles(); - -$serializeConfigClass = $coreFiles->getCoreFileByEntityName(PHPFHIR_ENCODING_CLASSNAME_SERIALIZE_CONFIG); -$unserializeConfigClass = $coreFiles->getCoreFileByEntityName(PHPFHIR_ENCODING_CLASSNAME_UNSERIALIZE_CONFIG); -$xmlWriterClass = $coreFiles->getCoreFileByEntityName(PHPFHIR_ENCODING_CLASSNAME_XML_WRITER); - -$imports = $coreFile->getImports(); - -$imports->addCoreFileImports($serializeConfigClass, $unserializeConfigClass, $xmlWriterClass); - ob_start(); echo 'declare(strict_types=1); @@ -38,8 +26,6 @@ getBasePHPFHIRCopyrightComment(true); ?> - - interface getEntityName(); ?> { /** diff --git a/template/core/types/interface_value_container_type.php b/template/core/types/interface_value_container_type.php index 8c7dc00d..3681d070 100644 --- a/template/core/types/interface_value_container_type.php +++ b/template/core/types/interface_value_container_type.php @@ -22,20 +22,10 @@ use DCarbone\PHPFHIR\Utilities\ImportUtils; $coreFiles = $config->getCoreFiles(); - $elementInterface = $coreFiles->getCoreFileByEntityName(PHPFHIR_TYPES_INTERFACE_ELEMENT_TYPE); -$serializeConfigClass = $coreFiles->getCoreFileByEntityName(PHPFHIR_ENCODING_CLASSNAME_SERIALIZE_CONFIG); -$xmlWriterClass = $coreFiles->getCoreFileByEntityName(PHPFHIR_ENCODING_CLASSNAME_XML_WRITER); -$xmlValueLocationEnum = $coreFiles->getCoreFileByEntityName(PHPFHIR_ENCODING_ENUM_VALUE_XML_LOCATION); $imports = $coreFile->getimports(); - -$imports->addCoreFileImports( - $elementInterface, - $serializeConfigClass, - $xmlWriterClass, - $xmlValueLocationEnum, -); +$imports->addCoreFileImports($elementInterface); ob_start(); echo 'declare(strict_types=1);