simplifying resource container implementation

dcarbone · Jan 6, 2025 · 86ab3bc · 86ab3bc
1 parent 6f6df20
commit 86ab3bc
Show file tree

Hide file tree

Showing 141 changed files with 395 additions and 198 deletions.
diff --git a/src/Builder.php b/src/Builder.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Builder/Import.php b/src/Builder/Import.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Builder;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Builder/Imports.php b/src/Builder/Imports.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Builder;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Builder/TypeBuilder.php b/src/Builder/TypeBuilder.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Builder;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Config.php b/src/Config.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/ConfigKeyEnum.php b/src/ConfigKeyEnum.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2024-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/CoreFile.php b/src/CoreFile.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2024-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/CoreFiles.php b/src/CoreFiles.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2024-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Enum/AttributeNameEnum.php b/src/Enum/AttributeNameEnum.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Enum;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Enum/ElementNameEnum.php b/src/Enum/ElementNameEnum.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Enum;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Enum/PrimitiveTypeEnum.php b/src/Enum/PrimitiveTypeEnum.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Enum;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Enum/PropertyUseEnum.php b/src/Enum/PropertyUseEnum.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Enum;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Enum/TypeKindEnum.php b/src/Enum/TypeKindEnum.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Enum;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,9 +48,8 @@ enum TypeKindEnum: string
     // treated a bit different
     case PHPFHIR_XHTML = 'phpfhir_xhtml';
 
-    private const _DSTU1_CONTAINER_TYPE = self::RESOURCE_INLINE;
-
-    private const _CONTAINER_TYPE = self::RESOURCE_CONTAINER;
+    private const _DSTU1_RESOURCE_CONTAINER_TYPE = self::RESOURCE_INLINE;
+    private const _RESOURCE_CONTAINER_TYPE = self::RESOURCE_CONTAINER;
 
     /**
      * Returns true if the provided FHIR type name is the "container" type for the provided version.
@@ -62,9 +61,9 @@ enum TypeKindEnum: string
     public static function isContainerTypeName(Version $version, string $fhirName): bool
     {
         if ($version->getSourceMetadata()->isDSTU1()) {
-            return $fhirName === self::_DSTU1_CONTAINER_TYPE->value;
+            return $fhirName === self::_DSTU1_RESOURCE_CONTAINER_TYPE->value;
         }
-        return $fhirName === self::_CONTAINER_TYPE->value;
+        return $fhirName === self::_RESOURCE_CONTAINER_TYPE->value;
     }
 
     /**
@@ -77,16 +76,16 @@ public function isOneOf(TypeKindEnum|string ...$other): bool
     }
 
     /**
-     * Returns true if this kind is the "container" kind for the provided FHIR version.
+     * Returns true if this kind is the "resource container" kind for the provided FHIR version.
      *
      * @param \DCarbone\PHPFHIR\Version $version
      * @return bool
      */
-    public function isContainer(Version $version): bool
+    public function isResourceContainer(Version $version): bool
     {
         if ($version->getSourceMetadata()->isDSTU1()) {
-            return $this === self::_DSTU1_CONTAINER_TYPE;
+            return $this === self::_DSTU1_RESOURCE_CONTAINER_TYPE;
         }
-        return $this === self::_CONTAINER_TYPE;
+        return $this === self::_RESOURCE_CONTAINER_TYPE;
     }
 }
diff --git a/src/LogLevel.php b/src/LogLevel.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2024-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Logger.php b/src/Logger.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Render/Templates.php b/src/Render/Templates.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Render;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,6 +55,9 @@ public static function renderVersionXHTMLTypeClass(Version $version, Types $type
      */
     public static function renderVersionTypeClass(Version $version, Types $types, Type $type): string
     {
+        if ($type->getKind()->isResourceContainer($version)) {
+            return require PHPFHIR_TEMPLATE_VERSION_TYPES_DIR . DIRECTORY_SEPARATOR . 'class_resource_container.php';
+        }
         return require PHPFHIR_TEMPLATE_VERSION_TYPES_DIR . DIRECTORY_SEPARATOR . 'class_default.php';
     }
 

diff --git a/src/Utilities/DocumentationUtils.php b/src/Utilities/DocumentationUtils.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Utilities;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Utilities/ExceptionUtils.php b/src/Utilities/ExceptionUtils.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Utilities;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Utilities/FileUtils.php b/src/Utilities/FileUtils.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Utilities;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Utilities/ImportUtils.php b/src/Utilities/ImportUtils.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Utilities;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,17 +48,12 @@ public static function buildVersionTypeImports(Type $type): void
         $typeKind = $type->getKind();
 
         if (!$type->isAbstract()) {
-            $imports->addCoreFileImportsByName(PHPFHIR_ENCODING_CLASSNAME_XML_WRITER);
-            $imports->addCoreFileImportsByName(PHPFHIR_ENCODING_ENUM_XML_LOCATION);
+            $imports->addCoreFileImportsByName(
+                PHPFHIR_ENCODING_CLASSNAME_XML_WRITER,
+                PHPFHIR_ENCODING_ENUM_XML_LOCATION,
+            );
         }
 
-        $imports->addVersionCoreFileImportsByName($type->getVersion(), PHPFHIR_CLASSNAME_VERSION);
-        $imports->addVersionCoreFileImportsByName($type->getVersion(), PHPFHIR_CLASSNAME_VERSION_CONSTANTS);
-        $imports->addCoreFileImportsByName(PHPFHIR_ENCODING_CLASSNAME_UNSERIALIZE_CONFIG);
-        $imports->addCoreFileImportsByName(PHPFHIR_ENCODING_CLASSNAME_SERIALIZE_CONFIG);
-
-        $imports->addCoreFileImportsByName(PHPFHIR_INTERFACE_TYPE);
-
         foreach ($type->getDirectlyImplementedInterfaces() as $interface => $namespace) {
             $imports->addImport($namespace, $interface);
         }
@@ -67,12 +62,33 @@ public static function buildVersionTypeImports(Type $type): void
             $imports->addImport($namespace, $trait);
         }
 
+        $imports->addVersionCoreFileImportsByName(
+            $type->getVersion(),
+            PHPFHIR_CLASSNAME_VERSION,
+            PHPFHIR_CLASSNAME_VERSION_CONSTANTS,
+        );
+
+        $imports->addCoreFileImportsByName(
+            PHPFHIR_ENCODING_CLASSNAME_UNSERIALIZE_CONFIG,
+            PHPFHIR_ENCODING_CLASSNAME_SERIALIZE_CONFIG,
+            PHPFHIR_INTERFACE_TYPE,
+        );
+
         if (($type->isCommentContainer() && !$type->hasCommentContainerParent()) ||
             $type->hasLocalPropertiesWithValidations() ||
             ($typeKind->isOneOf(TypeKindEnum::PRIMITIVE) && !$type->hasPrimitiveParent())) {
             $imports->addCoreFileImportsByName(PHPFHIR_CLASSNAME_CONSTANTS);
         }
 
+        if ($typeKind->isResourceContainer($type->getVersion())) {
+            $imports->addVersionCoreFileImportsByName(
+                $type->getVersion(),
+                PHPFHIR_CLASSNAME_VERSION_TYPE_MAP,
+                PHPFHIR_INTERFACE_VERSION_CONTAINED_TYPE,
+            );
+            return;
+        }
+
         if ($parentType = $type->getParentType()) {
             $imports->addImport(
                 $parentType->getFullyQualifiedNamespace(false),

diff --git a/src/Utilities/NameUtils.php b/src/Utilities/NameUtils.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Utilities;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Utilities/TypeHintUtils.php b/src/Utilities/TypeHintUtils.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Utilities;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Version.php b/src/Version.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR;
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2018-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Version/DefaultConfig.php b/src/Version/DefaultConfig.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version;
 
 /*
- * Copyright 2018-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2018-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Version/DefaultConfigKeyEnum.php b/src/Version/DefaultConfigKeyEnum.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version;
 
 /*
- * Copyright 2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2024-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Version/Definition.php b/src/Version/Definition.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Version/Definition/Decorator/AnnotationElementPropertyTypeDecorator.php b/src/Version/Definition/Decorator/AnnotationElementPropertyTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Version/Definition/Decorator/AnnotationElementTypeDecorator.php b/src/Version/Definition/Decorator/AnnotationElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Version/Definition/Decorator/AnyElementTypeDecorator.php b/src/Version/Definition/Decorator/AnyElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Version/Definition/Decorator/AttributeElementTypeDecorator.php b/src/Version/Definition/Decorator/AttributeElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Version/Definition/Decorator/ChoiceElementElementPropertyDecorator.php b/src/Version/Definition/Decorator/ChoiceElementElementPropertyDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/Version/Definition/Decorator/ChoiceElementTypeDecorator.php b/src/Version/Definition/Decorator/ChoiceElementTypeDecorator.php
@@ -3,7 +3,7 @@
 namespace DCarbone\PHPFHIR\Version\Definition\Decorator;
 
 /*
- * Copyright 2016-2024 Daniel Carbone (daniel.p.carbone@gmail.com)
+ * Copyright 2016-2025 Daniel Carbone (daniel.p.carbone@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.