WIP: V4

.gitattributes

@@ -4,4 +4,5 @@
 /README.md export-ignore
 /output export-ignore
 /input export-ignore
-/phpunit export-ignore
+/phpunit export-ignore
+fhir_test_resources.tar.gz export-ignore

.github/FUNDING.yml

@@ -1,13 +1,2 @@
-# These are supported funding model platforms
-
 github: dcarbone
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: dcarbone
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+ko_fi: dcarbone

.github/actions/load-fhir-validator/action.yaml

@@ -27,14 +27,14 @@ runs:
         echo 'url=${{ inputs.base-url }}/${{ inputs.version }}/${{ inputs.filename }}' >> $GITHUB_OUTPUT
         echo 'cache-key=fhir-validator-${{ inputs.version }}-2' >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@v4
-      id: cache
+    - name: 'Init validator cache'
+      uses: actions/cache@v4
+      id: validator-cache
       with:
         path: |
           ${{ github.workspace }}/bin
           /home/runner/.fhir
         key: '${{ steps.vars.outputs.cache-key }}'
-        save-always: true
 
     - name: 'Install Java'
       if: steps.cache.outputs.cache-hit != 'true' && steps.cache.outputs.cache-hit != true
@@ -62,4 +62,3 @@ runs:
         java -jar '${{ github.workspace }}/bin/validator_cli.jar' -version 4.3.0
         java -jar '${{ github.workspace }}/bin/validator_cli.jar' -version 5.0.0
         echo '::endgroup::'
-

.github/actions/load-fhir-xsd/action.yaml

@@ -67,5 +67,10 @@ runs:
 
         unzip -o -qq '${{ steps.vars.outputs.zip-filename }}' -d '${{ steps.vars.outputs.xsd-cache-dir }}'
 
+        if [ -d '${{ steps.vars.outputs.xsd-cache-dir }}/fhir-all-xsd' ]; then
+            mv '${{ steps.vars.outputs.xsd-cache-dir }}/fhir-all-xsd'/* '${{ steps.vars.outputs.xsd-cache-dir }}'
+            rmdir '${{ steps.vars.outputs.xsd-cache-dir }}/fhir-all-xsd'
+        fi
+
         ls -l '${{ steps.vars.outputs.cache-dir}}'
         ls -l '${{ steps.vars.outputs.xsd-cache-dir }}'

.github/workflows/tests.yaml

@@ -27,19 +27,25 @@ on:
 
 jobs:
   load-fhir-source:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:
-        fhir-version: [ 'DSTU1', 'DSTU2', 'STU3', 'R4', 'R5' ]
-
-    name: 'Download ${{ matrix.fhir-version }} Source'
+        test-target:
+          - 'DSTU1'
+          - 'DSTU2'
+          - 'STU3'
+          - 'R4'
+          - 'R4B'
+          - 'R5'
+
+    name: 'Download ${{ matrix.test-target }} Source'
     steps:
       - uses: actions/checkout@v4
 
       - uses: ./.github/actions/load-fhir-xsd
         with:
-          version: '${{ matrix.fhir-version }}'
+          version: '${{ matrix.test-target }}'
 
 
 #  load-fhir-validator:
@@ -58,24 +64,39 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ '8.1', '8.2', '8.3' ]
-        fhir-version: [ 'DSTU1', 'DSTU2', 'STU3', 'R4', 'R5' ]
+        php-version:
+          - '8.1'
+          - '8.2'
+          - '8.3'
+          - '8.4'
+        test-target:
+          - 'Core'
+          - 'DSTU1'
+          - 'DSTU2'
+          - 'STU3'
+          - 'R4'
+          - 'R4B'
+          - 'R5'
         include:
           - php-version: '8.1'
             phpunit-version: '10.5'
           - php-version: '8.2'
             phpunit-version: '11.1'
           - php-version: '8.3'
             phpunit-version: '11.1'
-    name: '${{ matrix.fhir-version }} - PHP ${{ matrix.php-version }} - PHPUnit ${{ matrix.phpunit-version }}'
+          - php-version: '8.4'
+            phpunit-version: '11.1'
+
+    name: '${{ matrix.test-target }} - PHP ${{ matrix.php-version }} - PHPUnit ${{ matrix.phpunit-version }}'
     steps:
       - name: 'Check the stuff out'
         uses: actions/checkout@v4
 
-      - name: 'Load FHIR ${{ matrix.fhir-version }} Source'
+      - name: 'Load FHIR ${{ matrix.test-target }} Source'
+        if: matrix.test-target != 'Core'
         uses: ./.github/actions/load-fhir-xsd
         with:
-          version: '${{ matrix.fhir-version }}'
+          version: '${{ matrix.test-target }}'
 
 #      - name: 'Install FHIR validator'
 #        uses: ./.github/actions/load-fhir-validator
@@ -105,23 +126,34 @@ jobs:
         run: |
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
-      - name: 'Cache Composer Stuff'
+      - name: 'Init composer dep cache'
+        id: cache
         uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: "composer-${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.phpunit-version }}-${{ hashFiles('composer.lock') }}"
-          save-always: true
 
       - name: 'Install Composer deps'
         # language=sh
         run: |
           rm composer.lock
           composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
-      - name: 'Generate code'
+      - name: 'Save composer dep cache'
+        if: steps.cache.outputs.cache-hit != 'true' && steps.cache.outputs.cache-hit != true
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: "composer-${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.phpunit-version }}-${{ hashFiles('composer.lock') }}"
+
+      - name: "Generate ${{ matrix.test-target }} code"
         # language=sh
         run: |
-          ./bin/generate.sh --useExisting --versions '${{ matrix.fhir-version }}'
+          if [ '${{ matrix.test-target }}' == 'Core' ]; then
+            ./bin/generate.sh --useExisting --onlyCore
+          else
+            ./bin/generate.sh --useExisting --versions '${{ matrix.test-target }}'
+          fi
 
 #      - name: 'Install Java'
 #        uses: actions/setup-java@v4
@@ -132,4 +164,4 @@ jobs:
       - name: 'Run tests'
         # language=sh
         run: |
-          ./vendor/bin/phpunit -c 'phpunit/${{ matrix.fhir-version }}.xml'
+          ./vendor/bin/phpunit -c 'phpunit/${{ matrix.test-target }}.xml'

README.md

@@ -84,8 +84,11 @@ You can view an example config array here: [bin/config.php](./bin/config.php).
 // first, build new configuration class
 $config = new \DCarbone\PHPFHIR\Config(require 'config.php');
 
+// if you wish to limit the versions generated to a subset of those configured:
+// $config->setVersionsToGenerate(['DSTU2', 'STU3']);
+
 // next, iterate through all configured versions and render code:
-foreach ($config->getVersions() as $versionConfig) {
+foreach ($config->getVersionsIterator() as $versionConfig) {
     $versionConfig->getDefinition()->getBuilder()->render();
 }
 ```

bin/config.php

@@ -20,51 +20,69 @@
  */
 return [
     // The path to look look for and optionally download source XSD files to
-    'schemaPath'  => __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'input/',
+    'schemaPath' => __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'input' . DIRECTORY_SEPARATOR,
 
-    // The path to place generated type class files
-    'classesPath' => __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'output/',
+    // The path to place generated files
+    'outputPath' => __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'output' . DIRECTORY_SEPARATOR,
 
-    // If true, will use a noop null logger
-    'silent'      => false,
+    // The root namespace for all generated classes
+    'rootNamespace' => '\\DCarbone\\PHPFHIRGenerated',
 
-    // If true, will skip generation of test classes
-    'skipTests'   => false,
+    // If true, will use a noop null logger
+    'silent' => false,
 
-    // If you wish to specify alternative libxml opts, do so here.
-    'libxmlOpts'  => LIBXML_NONET | LIBXML_BIGLINES | LIBXML_PARSEHUGE | LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOXMLDECL,
+    // The libxml opts to use for parsing source XSD's.
+    'libxmlOpts' => LIBXML_NONET | LIBXML_BIGLINES | LIBXML_PARSEHUGE | LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOXMLDECL,
 
-    // Map of versions and configurations to generate
-    // Each entry in this map will grab the latest revision of that particular version.  If you wish to use a specific
-    // version, please see https://www.hl7.org/fhir/directory.html
-    'versions'    => [
+    // Map of versions and configurations to generate.
+    // Each entry in this map will grab the latest revision of that particular version.
+    //
+    // For a list of base versions, see here: https://www.hl7.org/fhir/directory.html
+    'versions' => [
         'DSTU1' => [
             // Source URL
-            'url'       => 'https://hl7.org/fhir/DSTU1/fhir-all-xsd.zip',
-            // Namespace to prefix the generated classes with
-            'namespace' => '\\HL7\\FHIR\\DSTU1',
-            // if defined, enables integration and validation test generation against the provided endpoint.
-            'testEndpoint' => '',
+            'sourceUrl' => 'https://hl7.org/fhir/DSTU1/fhir-all-xsd.zip',
+            // Namespace to generate classes into
+            'namespace' => 'Versions\\DSTU1',
+
+            // The default configuration for all instances of this version.  May be overridden per version during
+            // instantiation.
+            'defaultConfig' => [
+                'unserializeConfig' => [
+                    // Libxml options to use when unserializing types from XML
+                    'libxmlOptMask' => 'LIBXML_NONET | LIBXML_BIGLINES | LIBXML_PARSEHUGE | LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOXMLDECL',
+                    // Maximum depth to allow when decoding JSON
+                    'jsonDecodeMaxDepth' => 512,
+                ],
+                'serializeConfig' => [
+                    // If true, will override the default xmlns value with the value provided in the rootXmlns key
+                    'overrideSourceXMLNS' => false,
+                    // If overrideSourceXmlns is true, this value will be used as the root xmlns value
+                    'rootXMLNS' => 'http://hl7.org/fhir',
+                    // Libxml options to use when serializing XHTML content
+                    'xhtmlLibxmlOptMask' => 'LIBXML_NONET | LIBXML_BIGLINES | LIBXML_PARSEHUGE | LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOXMLDECL',
+                ]
+            ]
         ],
         'DSTU2' => [
-            'url'          => 'https://hl7.org/fhir/DSTU2/fhir-all-xsd.zip',
-            'namespace'    => '\\HL7\\FHIR\\DSTU2',
-            'testEndpoint' => 'https://hapi.fhir.org/baseDstu2',
+            'sourceUrl' => 'https://hl7.org/fhir/DSTU2/fhir-all-xsd.zip',
+            'namespace' => 'Versions\\DSTU2',
+        ],
+        'STU3' => [
+            'sourceUrl' => 'https://hl7.org/fhir/STU3/fhir-all-xsd.zip',
+            'namespace' => 'Versions\\STU3',
         ],
-        'STU3'  => [
-            'url'          => 'https://hl7.org/fhir/STU3/fhir-all-xsd.zip',
-            'namespace'    => '\\HL7\\FHIR\\STU3',
-            'testEndpoint' => 'https://hapi.fhir.org/baseDstu3',
+        'R4' => [
+            'sourceUrl' => 'https://hl7.org/fhir/R4/fhir-all-xsd.zip',
+            'namespace' => 'Versions\\R4',
         ],
-        'R4'    => [
-            'url'          => 'https://hl7.org/fhir/R4/fhir-all-xsd.zip',
-            'namespace'    => '\\HL7\\FHIR\\R4',
-            'testEndpoint' => 'https://hapi.fhir.org/baseR4',
+        'R4B' => [
+            'sourceUrl' => 'https://hl7.org/fhir/R4B/fhir-all-xsd.zip',
+            'namespace' => 'Versions\\R4B',
         ],
         'R5' => [
-            'url'          => 'https://hl7.org/fhir/R5/fhir-all-xsd.zip',
-            'namespace'    => '\\HL7\\FHIR\\R5',
-            'testEndpoint' => 'https://hapi.fhir.org/baseR5',
+            'sourceUrl' => 'https://hl7.org/fhir/R5/fhir-all-xsd.zip',
+            'namespace' => 'Versions\\R5',
         ]
 
         //        'Build' => [