cleanup, adding R4B

Author: dcarbone

.github/workflows/tests.yaml

@@ -36,6 +36,7 @@ jobs:
           - 'DSTU2'
           - 'STU3'
           - 'R4'
+          - 'R4B'
           - 'R5'
 
     name: 'Download ${{ matrix.test-target }} Source'
@@ -74,6 +75,7 @@ jobs:
           - 'DSTU2'
           - 'STU3'
           - 'R4'
+          - 'R4B'
           - 'R5'
         include:
           - php-version: '8.1'

bin/config.php

@@ -79,6 +79,10 @@
             'sourceUrl' => 'https://hl7.org/fhir/R4/fhir-all-xsd.zip',
             'namespace' => 'Versions\\R4',
         ],
+        'R4B' => [
+            'sourceUrl' => 'https://hl7.org/fhir/R4B/fhir-all-xsd.zip',
+            'namespace' => 'Versions\\R4B',
+        ],
         'R5' => [
             'sourceUrl' => 'https://hl7.org/fhir/R5/fhir-all-xsd.zip',
             'namespace' => 'Versions\\R5',

phpunit/R4B.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         bootstrap="bootstrap.php"
+         colors="true"
+         stopOnFailure="false"
+         displayDetailsOnIncompleteTests="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerNotices="true">
+    <php>
+        <ini name="memory_limit" value="2048M"/>
+        <env name="PHPFHIR_TEST_INTEGRATION_ENDPOINT" value="https://lforms-fhir.nlm.nih.gov/baseR4" force="true"/>
+    </php>
+    <testsuites>
+        <testsuite name="R4B">
+            <directory>../output/DCarbone/PHPFHIRGenerated/Versions/R4B/Tests</directory>
+        </testsuite>
+    </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">../src</directory>
+        </include>
+    </source>
+</phpunit>

src/Config.php

@@ -71,7 +71,7 @@ class Config implements LoggerAwareInterface
      * @param array $params
      * @param \Psr\Log\LoggerInterface|null $logger
      */
-    public function __construct(array $params = [], LoggerInterface $logger = null)
+    public function __construct(array $params = [], null|LoggerInterface $logger = null)
     {
         foreach (ConfigKeyEnum::required() as $key) {
             if (!isset($params[$key->value])) {

src/Enum/AttributeName.php renamed to src/Enum/AttributeNameEnum.php

@@ -18,11 +18,7 @@
  * limitations under the License.
  */
 
-/**
- * Class AttributeNameEnum
- * @package DCarbone\PHPFHIR\Enum
- */
-enum AttributeName : string
+enum AttributeNameEnum : string
 {
     case NAME         = 'name';
     case VALUE        = 'value';
@@ -38,10 +34,10 @@ enum AttributeName : string
     case NAMESPACE    = 'namespace';
 
     /**
-     * @param \DCarbone\PHPFHIR\Enum\AttributeName|string ...$other
+     * @param \DCarbone\PHPFHIR\Enum\AttributeNameEnum|string ...$other
      * @return bool
      */
-    public function isOneOf(AttributeName|string ...$other): bool
+    public function isOneOf(AttributeNameEnum|string ...$other): bool
     {
         return in_array($this, $other, true) || in_array($this->value, $other, true);
     }

src/Enum/ElementName.php renamed to src/Enum/ElementNameEnum.php

@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-enum ElementName : string
+enum ElementNameEnum : string
 {
     case _INCLUDE = 'include';
     case IMPORT   = 'import';
@@ -47,10 +47,10 @@ enum ElementName : string
     case ANY = 'any';
 
     /**
-     * @param \DCarbone\PHPFHIR\Enum\ElementName|string ...$other
+     * @param \DCarbone\PHPFHIR\Enum\ElementNameEnum|string ...$other
      * @return bool
      */
-    public function isOneOf(ElementName|string ...$other): bool
+    public function isOneOf(ElementNameEnum|string ...$other): bool
     {
         return in_array($this, $other, true) || in_array($this->value, $other, true);
     }

src/Enum/PropertyUse.php renamed to src/Enum/PropertyUseEnum.php

@@ -18,21 +18,17 @@
  * limitations under the License.
  */
 
-/**
- * Class PropertyUseEnum
- * @package DCarbone\PHPFHIR\Enum
- */
-enum PropertyUse: string
+enum PropertyUseEnum: string
 {
     case PROHIBITED = 'prohibited';
     case OPTIONAL   = 'optional';
     case REQUIRED   = 'required';
 
     /**
-     * @param \DCarbone\PHPFHIR\Enum\PropertyUse|string ...$other
+     * @param \DCarbone\PHPFHIR\Enum\PropertyUseEnum|string ...$other
      * @return bool
      */
-    public function isOneOf(PropertyUse|string ...$other): bool
+    public function isOneOf(PropertyUseEnum|string ...$other): bool
     {
         return in_array($this, $other, true) || in_array($this->value, $other, true);
     }

src/Enum/TypeKind.php

@@ -0,0 +1,88 @@
+<?php declare(strict_types=1);
+
+namespace DCarbone\PHPFHIR\Enum;
+
+/*
+ * Copyright 2016-2024 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+enum TypeKindEnum: string
+{
+    // this represents an actual value: string, int, etc.
+    case PRIMITIVE = 'primitive';
+
+    // these represent types that exist to wrap a primitive
+    case PRIMITIVE_CONTAINER = 'primitive_container';
+
+    // primitive type with limited possible value set
+    case LIST = 'list';
+
+    // complex types
+    case BASE = 'Base';
+    case EXTENSION          = 'Extension';
+    case ELEMENT            = 'Element';
+    case BINARY             = 'Binary';
+    case BACKBONE_ELEMENT   = 'BackboneElement';
+    case RESOURCE           = 'Resource';
+    case RESOURCE_CONTAINER = 'ResourceContainer';
+    case RESOURCE_INLINE    = 'Resource.Inline';
+    case QUANTITY           = 'Quantity';
+
+    // this indicates a type that is an immediate child of a resource and not used elsewhere
+    case RESOURCE_COMPONENT = 'resource_component';
+
+    // treated a bit different
+    case PHPFHIR_XHTML = 'phpfhir_xhtml';
+
+    private const CONTAINER_TYPES = [
+        self::RESOURCE_CONTAINER,
+        self::RESOURCE_INLINE,
+    ];
+
+    /**
+     * Returns true if the provided FHIR type name is the "container" type for the provided version.
+     *
+     * @param string $fhirName
+     * @return bool
+     */
+    public static function isContainerTypeName(string $fhirName): bool
+    {
+        return in_array($fhirName, self::_containerTypeStrings(), true);
+    }
+
+    /**
+     * @param \DCarbone\PHPFHIR\Enum\TypeKindEnum|string ...$other
+     * @return bool
+     */
+    public function isOneOf(TypeKindEnum|string ...$other): bool
+    {
+        return in_array($this, $other, true) || in_array($this->value, $other, true);
+    }
+
+    /**
+     * Returns true if this kind is the "container" kind for the provided FHIR version.
+     *
+     * @return bool
+     */
+    public function isContainer(): bool
+    {
+        return in_array($this, self::CONTAINER_TYPES, true);
+    }
+
+    private static function _containerTypeStrings(): array
+    {
+        return array_map(function (TypeKindEnum $tk): string { return $tk->value; }, self::CONTAINER_TYPES);
+    }
+}