Skip to content

Commit

Permalink
interface import cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
dcarbone committed Feb 1, 2025
1 parent 55735b5 commit 7b35c13
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 27 deletions.
3 changes: 1 addition & 2 deletions template/core/types/interface_primitive_type.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 '<?php ';?>declare(strict_types=1);
Expand Down
14 changes: 0 additions & 14 deletions template/core/types/interface_type.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,13 @@
/** @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 '<?php ';?>declare(strict_types=1);

namespace <?php echo $coreFile->getFullyQualifiedNamespace(false); ?>;

<?php echo $config->getBasePHPFHIRCopyrightComment(true); ?>

<?php echo ImportUtils::compileImportStatements($imports); ?>

interface <?php echo $coreFile->getEntityName(); ?>
{
/**
Expand Down
12 changes: 1 addition & 11 deletions template/core/types/interface_value_container_type.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 '<?php ';?>declare(strict_types=1);
Expand Down

0 comments on commit 7b35c13

Please sign in to comment.